From a38281e697cde9f45926a6af0c88bec14501fec0 Mon Sep 17 00:00:00 2001
From: liuyg <liuyg@qq.com>
Date: Tue, 15 Feb 2022 11:06:34 +0800
Subject: [PATCH] 68个表格在1366*768下的适配，保安单位情况智能分析中的图表的适配以及其按钮会被遮住不能点击
---
src/views/trainExam/index.vue | 397
src/views/securityUnit/localCompany.vue | 301
src/views/securityAnalysis/child/assignment copy.vue | 271
src/views/accreditationRecords/accreditationRecordsPaper.vue | 212
src/views/resource/oss.vue | 116
src/views/exam/examPayment.vue | 235
src/views/securityAnalysis/child/situation.vue | 65
src/styles/smallSize.scss | 111
src/views/ownerFeedback/owner.vue | 89
src/views/people/expression.vue | 52
src/views/trainingRegistration/index.vue | 125
src/views/desk/notification.vue | 99
src/views/securityUnitChild/index copy.vue | 329
src/views/dispatch/dispatchChildoperable.vue | 173
src/views/people/data.js | 668 +-
src/views/securityUnitChild/shareholder.vue | 102
src/views/talk/talk.vue | 89
src/store/getters.js | 9
src/views/resource/attach.vue | 85
src/views/securityGuard/data.js | 1518 ++--
src/views/authority/apiscope.vue | 197
src/views/zc/zc.vue | 83
src/views/securityAnalysis/child/dispatch.vue | 78
src/views/licenseApproval/branchOffice.vue | 220
src/views/system/dict.vue | 158
src/views/statisticalQueryManagement/businessStatistics.vue | 147
src/views/system/topmenu.vue | 84
src/views/authority/datascope.vue | 216
src/views/workreport/workreport.vue | 67
src/views/accreditationRecords/accreditationRecords.vue | 223
src/views/recruitmentManagement/index.vue | 106
src/views/system/menu.vue | 129
src/views/trainExam/singleperformance.vue | 317
src/views/desk/notice.vue | 103
src/views/authority/role.vue | 84
src/views/companyApply/index.vue | 393
src/views/dispatch/dispatch.vue | 308
src/views/exam/subject.vue | 287
src/store/onresize.js | 51
src/views/exam/startexam.vue | 193
src/views/securityAnalysis/child/certificate.vue | 85
src/views/licenseApproval/securityGuard.vue | 262
src/views/licenseApproval/crossRegion.vue | 216
src/views/system/client.vue | 128
src/views/trainExam/modifiedGrades.vue | 357
src/views/securityAnalysis/child/assignment.vue | 84
src/views/applyexam/index.vue | 474
src/views/securityUnitChild/manager.vue | 153
src/views/system/param.vue | 27
src/views/securityGuard/securityGuard.vue | 190
src/views/trainExam/performance.vue | 309
src/views/system/user.vue | 254
src/views/securityEquipment/gun.vue | 174
src/views/system/tenant.vue | 117
src/views/workreport/workreply.vue | 70
src/views/desk/policyRelease.vue | 99
src/views/securityUnitChild/index.vue | 198
src/views/licenseApproval/securityPermit.vue | 216
src/store/modules/control.js | 311
src/views/securityAnalysis/child/socialSecurity.vue | 62
src/views/people/job.vue | 52
src/views/securityAnalysis/child/loginRecord.vue | 108
src/views/exam/performance.vue | 310
src/views/securityEquipment/car.vue | 191
src/views/system/dept.vue | 97
src/views/securityUnitChild/social.vue | 128
src/views/traincompany/index.vue | 126
src/views/securityUnit/selfRecruitedSecurityGuard.vue | 304
src/views/statisticalQueryManagement/securityGuardStatistics.vue | 123
src/views/securityAnalysis/child/examination.vue | 78
src/styles/element-ui.scss | 175
src/views/system/dictbiz.vue | 157
src/views/securityEquipment/equipments.vue | 189
src/views/dispatch/dispatchChildoperableSee.vue | 168
src/views/system/post.vue | 91
src/views/licenseApproval/cancellationOfFiling.vue | 200
src/views/securityUnit/transRegionalcompany.vue | 299
src/views/licenseApproval/securityTraining.vue | 216
src/views/securityAnalysis/index.vue | 646 +
src/views/securityUnit/securityTraining.vue | 298
src/views/exam/singleperformance.vue | 234
81 files changed, 8,544 insertions(+), 7,922 deletions(-)
diff --git a/src/store/getters.js b/src/store/getters.js
index 51e61df..e351db6 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -7,7 +7,8 @@
themeName: state => state.common.themeName,
isShade: state => state.common.isShade,
isCollapse: state => state.common.isCollapse,
- keyCollapse: (state, getters) => getters.screen > 1 ? getters.isCollapse : false,
+ keyCollapse: (state, getters) =>
+ getters.screen > 1 ? getters.isCollapse : false,
screen: state => state.common.screen,
isLock: state => state.common.isLock,
isFullScren: state => state.common.isFullScren,
@@ -31,5 +32,7 @@
windowWidth: state => state.control.windowWidth,
windowHeight: state => state.control.windowHeight,
table_height: state => state.control.table_height,
-}
-export default getters
+ screenSize: state => state.control.screenSize,
+ screenHeight: state => state.control.screenHeight
+};
+export default getters;
diff --git a/src/store/modules/control.js b/src/store/modules/control.js
index d842cbd..20f6611 100644
--- a/src/store/modules/control.js
+++ b/src/store/modules/control.js
@@ -1,7 +1,14 @@
// import {getStore, setStore} from '@/util/store'
// import {getDictionary} from '@/api/system/dict'
-
+let screenSizes = {
+ w: window.screen.width,
+ h: window.screen.height
+};
+let innerWH = {
+ innerWidth: window.innerWidth,
+ innerHeight: window.innerHeight
+};
const control = {
state: {
clearOtherBut: {
@@ -9,97 +16,110 @@
columnBtn: false,
searchShowBtn: false,
filterBtn: false,
+ addBtn: false,
+ editBtn: false,
+ viewBtn: false,
+ delBtn: false,
+ searchIndex: 6, //收缩展示数量
+ searchIcon: true, //搜索是否收缩
+ height: window.screen.height //初始高度
},
changePageSize: {
pageSize: 15,
currentPage: 1,
total: 0,
- pageSizes: [15, 30, 50, 100],
+ pageSizes: [15, 30, 50, 100]
},
- windowWidth: 1025,
- windowHeight: 990,
- heightTimesOut: '',
+ windowWidth: innerWH.innerWidth,
+ windowHeight: innerWH.innerHeight,
+ tableWindowHeight: innerWH.innerHeight,
+ heightTimesOut: "",
table_height: "",
- butState: '',
- oldOpens: ''
+ butState: "",
+ oldOpens: "",
+ screenSize: screenSizes.w <= 1366 && screenSizes.h <= 768,
+ screenHeight: 1000,
+
+ searchOpen: {
+ searchIndex: 6, //收缩展示数量
+ searchIcon: true, //搜索是否收缩
+ height: window.screen.height //初始高度
+ }
},
actions: {
- WHchangeHight({ state, commit }, data) {
+ WHchangeHight({
+ state,
+ commit
+ }, data) {
if (data.fn) {
if (!state.heightTimesOut) {
data.fn(state.windowHeight);
+ } else {
+ state.heightTimesOut = setTimeout(() => {
+ clearTimeout(state.heightTimesOut);
+ state.heightTimesOut = "";
+ data.fn(state.windowHeight);
+ }, 500);
}
- state.heightTimesOut = setTimeout(() => {
- clearTimeout(state.heightTimesOut);
- state.heightTimesOut = '';
- }, 300);
}
},
- TABLE_CHANGEBUTPOSITION({ state, commit, dispatch }, data) {
- let changedom = function (val) {
- let table = document.getElementsByClassName("tablesss")[0];
- let heard = table.getElementsByClassName("avue-crud__search")[0];//获取搜索的长度
- let buts = table.getElementsByClassName("avue-form__menu--center")[0];
- let Open = buts.getElementsByClassName("el-button--text")[0]
- let butsheight = heard.clientHeight;
- let butX = 0;
- if (data.from == "mounted") {
- commit("setOldOpens", '')
- commit("setButOpens", '')
- }
- // console.log(state.butState, val, butsheight)
- if (state.butState == "展 开") {
- commit("setOldOpens", '')
- }
- if (val == "收 缩") {
- commit("setOldOpens", butsheight)
- } else if (val == undefined && state.oldOpens) {
- butsheight = state.oldOpens;
- butX = state.oldOpens - heard.clientHeight;
- // commit("setOldOpens", '')
- }
- // console.log(state.butState, val, butsheight, butX);
- let sets = window.innerWidth <= 1376 && window.innerHeight <= 778;
- let usNumOpens = sets ? -78 : -78;
- if (butX || sets) {
- Open.style.top = usNumOpens - +butX + "px";
- }
- buts.style.top = butsheight + "px";
- if (val != "收 缩") {
- let other = data.otherclass || [];
- if (other && state.windowWidth >= 1024)
- for (let k in other) {
- let otherbuts = document.getElementsByClassName(other[k])[0]
- otherbuts.style.top = butsheight + 27 + "px";
- }
- }
- if (state.butState == "收 缩" && !val) {
- Open.click();
- }
- if (data.haveOpen && !val) {// 是否有展开按钮
- Open.onclick = function (e) {
- changedom(e.srcElement.innerText);
- //固定高度
- //调用改变高度
- if (e.srcElement.innerText == "展 开") {
- state.windowHeight += 1;
- } else {
- state.windowHeight -= 1;
- }
- commit("setButOpens", e.srcElement.innerText)
+
+ TABLE_CHANGEBUTPOSITION({
+ state,
+ commit,
+ dispatch
+ }, data) {
+ let table = document.getElementsByClassName("tablesss")[0];
+ let heard = table.getElementsByClassName("avue-crud__search")[0]; //获取搜索的长度
+ let buts = table.getElementsByClassName("avue-form__menu--center")[0];
+ let Open = buts.getElementsByClassName("el-button--text")[0];
+ let butsheight = heard.clientHeight;
+ let other = data.otherclass || [];
+ // buts.style.transition = "all 0.1s";
+ if (buts) {
+ buts.style.top = butsheight - 3 + "px";
+ }
+ if (other && state.windowWidth >= 1024) {
+ for (let k in other) {
+ let otherbuts = document.getElementsByClassName(other[k])[0];
+ // otherbuts.style.transition = "all 0.1s";
+ if (otherbuts) {
+ otherbuts.style.top = butsheight + 26 + "px";
}
}
-
}
- changedom();
+ // Open.style.transition = "all 0.1s";
+ // Open.style.top = -(butsheight + 4) + "px";
+ // 添加事件
+ if (Open) {
+ Open.style.top = (state.screenSize ? 125 : 140) + "px";
+ Open.onclick = function (e) {
+ // changedom(e.srcElement.innerText);
+ //固定高度
+ //调用改变高度
+ if (e.srcElement.innerText == "展 开") {
+ state.tableWindowHeight += 1;
+ } else {
+ state.tableWindowHeight -= 1;
+ }
+ // commit("setButOpens", e.srcElement.innerText);
+ };
+ }
},
- TABLE_CHANGEHEIGHT({ state, commit }, data) {
+ TABLE_CHANGEHEIGHT({
+ state,
+ commit
+ }, data) {
let h = +state.windowHeight - (+data.searchHeight + +data.flowHeight);
- console.log(h)
+ console.log(h);
state.table_height = h;
// commit("settable_height", h);
},
- changeZoom({ state, commit }, data) {
+ changeZoom({
+ state,
+ commit,
+ dispatch
+ }, data) {
if (window.innerWidth <= 1396 && window.innerHeight <= 798) {
// var devicewidth = document.documentElement.clientWidth; //获取当前分辨率下的可是区域宽度
// console.log(devicewidth)
@@ -113,16 +133,132 @@
// console.log("还原缩放")
}
}
+ // return;
+ let usheight = 0;
+ //监听可视高度
+ Object.defineProperty(state, "tableWindowHeight", {
+ set: function (key, value) {
+ // //此处拦截了设置请求
+ // window.console.log(key, value, "tableWindowHeight");
+ usheight = key;
+ let d = {
+ fn: function (h) {
+ let doit = (height, val) => {
+ let table = document.getElementsByClassName("tablesss");
+ // console.log(table[0]);
+ if (table[0]) {
+ //有需要调整的表格
+ let heard = table[0].getElementsByClassName(
+ "avue-crud__search"
+ );
+ let tip = document.getElementsByClassName("avue-crud__tip")[0];
+ let usNum = state.screenSize ? 165 : 302;
+ if (!tip) {
+ // console.log("没有tip")
+ usNum = usNum - 50;
+ }
+ let pagination = document.getElementsByClassName("avue-crud__pagination")[0];
+ if (!pagination) {
+ // console.log("没有分页")
+ usNum = usNum - 45;
+ }
+ let nav_scroll = document.getElementsByClassName("el-tabs__nav-scroll");
+ if (nav_scroll[1]) {
+ // console.log("有额外标签栏")
+ usNum = usNum + 55;
+ }
+ let hs = height || h;
+ let overHeight = +hs - (+heard[0].clientHeight + +usNum);
+ // console.log(overHeight, heard[0].clientHeight, usNum);
+ let fromDom = document.getElementsByClassName(
+ "el-table--fit"
+ );
+ if (fromDom) {
+ let ifsize = fromDom.length;
+ // console.log("页面表格数量：", ifsize)
+ for (let ifrom = 0; ifrom < ifsize; ifrom++) {
+ // fromDom[ifrom].style.transition = "height 0.1s";
+ fromDom[ifrom].style.maxHeight = overHeight + "px";
+ fromDom[ifrom].style.height = overHeight + "px";
+ }
+ }
+ let d = {
+ otherclass: ["downSFZ"],
+ haveOpen: true
+ };
+ dispatch("TABLE_CHANGEBUTPOSITION", d);
+ }
+ return;
+ };
+ // if (that.onceTableChange == 1) {
+ // //解决第一次未渲染成功会报错的问题
+ // that.onceTableChange++;
+ // console.log(that.onceTableChange);
+ // commit("checkDomHeight", {
+ // domName: "getElementsByClassName",
+ // name: "el-table--fit",
+ // fn: function() {
+ // that.$nextTick(() => {
+ // setTimeout(() => {
+ // doit(window.innerHeight, "once");
+ // }, 200);
+ // });
+ // }
+ // });
+ // } else {
+ doit(window.innerHeight);
+ // }
+ }
+ };
+ dispatch("WHchangeHight", d);
+ return
+ // tablesss
+ // class="tablesss"
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : '',
+
+ // searchIndex: 6, //收缩展示数量
+ // searchIcon: true, //搜索是否收缩
+ // ...this.$store.state.control.searchOpen,
+ // height: "auto",
+ // 初始化位置， 放入mounted, 以及放入onload的获取数据后
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
+ get: function () {
+ // console.log('get!', usheight);
+ return usheight;
+ }
+ });
+ },
+ MOUNTED_TABLE_SIZE({
+ state,
+ commit,
+ dispatch
+ }, data) {
+ let d = {
+ otherclass: ["downSFZ"],
+ haveOpen: true,
+ from: "mounted"
+ };
+ // 开始就适应高度
+ commit("setWindowSizeHeightAdd");
+ // dispatch("TABLE_CHANGEBUTPOSITION", d);
}
},
mutations: {
setWindowSize: (state, data) => {
state.windowWidth = data.innerWidth;
state.windowHeight = data.innerHeight;
- // console.log(data)
+ // console.log(state.windowHeight, "state.windowHeight")
+ },
+ setWindowSizeHeight: (state, data) => {
+ state.tableWindowHeight = data;
+ // console.log(state.tableWindowHeight, "state.tableWindowHeight")
},
setWindowSizeHeightAdd: (state, data) => {
- state.windowHeight += 1;
+ setTimeout(() => {
+ state.tableWindowHeight += 1;
+ }, 0);
},
setButOpens(state, data) {
state.butState = data;
@@ -130,9 +266,40 @@
setOldOpens(state, data) {
state.oldOpens = data;
state.oldOpens = data;
+ },
+ setScreenSize(state, data) {
+ state.screenSize = data.w <= 1366 && data.h <= 768 ? 1366 : false;
+ state.screenHeight = data.h;
+ },
+ checkDomHeight(state, data) {
+ // 声明定时器
+ var timer = null;
+ // 检查dom是否执行完成
+ function checkDom() {
+ let dom = document[data.domName](data.name);
+ console.log(dom[0].style.height, "height");
+ if (dom[0].style.height) {
+ // 执行dom加载完成后的操作
+ // 清除定时器
+ if (!timer) {
+ clearTimeout(timer);
+ }
+ if (data.fn) {
+ //回调函数
+ data.fn(dom);
+ return;
+ } else {
+ return dom;
+ }
+ } else {
+ // 自我调用
+ timer = setTimeout(checkDom, 200);
+ }
+ }
+ // 首次执行
+ checkDom();
}
}
};
-
export default control;
diff --git a/src/store/onresize.js b/src/store/onresize.js
index 2169b6b..507ae13 100644
--- a/src/store/onresize.js
+++ b/src/store/onresize.js
@@ -1,21 +1,26 @@
-import _this from '../main'
-
+import _this from "../main";
// 设置 init 函数
function init() {
- if (_this) {
- let innerWH = {
- innerWidth: window.innerWidth,
- innerHeight: window.innerHeight,
- // innerWidth: document.documentElement.clientWidth,
- // innerHeight: document.documentElement.clientHeight,
- }
- _this.$store.commit('setWindowSize', innerWH);
- // console.log(' window.innerWidth', window.innerWidth);
- // console.log(' window.innerHeight', window.innerHeight);
- _this.$store.dispatch("changeZoom");
+ if (_this) {
+ let innerWH = {
+ innerWidth: window.innerWidth,
+ innerHeight: window.innerHeight
+ // innerWidth: document.documentElement.clientWidth,
+ // innerHeight: document.documentElement.clientHeight,
+ };
+ _this.$store.commit("setWindowSize", innerWH);
+ _this.$store.commit("setWindowSizeHeight", innerWH.innerHeight);
+ _this.$store.commit("setScreenSize", {
+ w: window.screen.width,
+ h: window.screen.height
+ });
- }
+ // console.log("第下次判断屏幕分辨率");
+ // console.log(' window.innerWidth', window.innerWidth);
+ // console.log(' window.innerHeight', window.innerHeight);
+ _this.$store.dispatch("changeZoom");
+ }
}
// 节流 ms 触发间隔毫秒
@@ -23,20 +28,24 @@
var lastClick = Date.now() - ms;
// 初始化
setTimeout(() => {
- init();
+ init();
}, 500);
// 改变窗口大小时重新设置 rem
// window.onresize = function () {
-// // 节流
+// // 节流
// if (Date.now() - lastClick >= ms) {
// init();
// lastClick = Date.now();
// }
// }
-window.addEventListener('resize', () => {
- // 节流
+window.addEventListener(
+ "resize",
+ () => {
+ // 节流
if (Date.now() - lastClick >= ms) {
- init();
- lastClick = Date.now();
+ init();
+ lastClick = Date.now();
}
-}, false)
\ No newline at end of file
+ },
+ false
+);
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 540646d..e92b3c5 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -1,6 +1,6 @@
.el-dropdown-menu__item {
- font-size: 12px !important;
- line-height: 28px !important;
+ font-size: 12px !important;
+ line-height: 28px !important;
}
//.el-card.is-always-shadow {
@@ -8,43 +8,43 @@
// border: none !important;
//}
.el-scrollbar__view {
- height: 100%;
+ height: 100%;
}
.el-menu--horizontal {
- border-bottom: none !important;
+ border-bottom: none !important;
}
.el-menu {
- border-right: none !important;
+ border-right: none !important;
}
.el-menu--display,
.el-menu--display + .el-submenu__icon-arrow {
- display: none;
+ display: none;
}
.el-message__icon,
.el-message__content {
- display: inline-block;
+ display: inline-block;
}
.el-date-editor .el-range-input,
.el-date-editor .el-range-separator {
- height: auto;
- overflow: hidden;
+ height: auto;
+ overflow: hidden;
}
.el-dialog__wrapper {
- z-index: 2048;
+ z-index: 2048;
}
.el-col {
- margin-bottom: 8px;
+ margin-bottom: 8px;
}
.el-main {
- padding: 0 !important;
+ padding: 0 !important;
}
.el-dropdown-menu__item--divided:before,
@@ -52,7 +52,7 @@
.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
- background-color: transparent;
+ background-color: transparent;
}
.el-dropdown-menu__item--divided:before,
@@ -60,24 +60,24 @@
.el-menu--horizontal > .el-menu-item:not(.is-disabled):focus,
.el-menu--horizontal > .el-menu-item:not(.is-disabled):hover,
.el-menu--horizontal > .el-submenu .el-submenu__title:hover {
- background-color: transparent !important;
+ background-color: transparent !important;
}
.el-card__header {
- padding: 6px 18px !important;
+ padding: 6px 18px !important;
}
.el-card__body {
- //padding: 16px !important;
+ //padding: 16px !important;
}
.el-divider--horizontal {
- margin: 12px 0 !important;
+ margin: 12px 0 !important;
}
//表格斑马纹
.el-table tr:nth-child(2n -1) {
- // background-color: rgba($color: #000000, $alpha: 0.1) !important;
+ // background-color: rgba($color: #000000, $alpha: 0.1) !important;
}
// //顶部搜索栏
@@ -199,86 +199,86 @@
// width: 165px !important;
// }
.avue-form__menu--center .el-button {
- float: left;
+ float: left;
}
.dispatch .avue-form__menu--center .el-button {
- float: none;
+ float: none;
}
.avue-form__menu--center .el-button:nth-child(1) {
- margin-left: 30px;
+ margin-left: 30px;
}
//左侧导航栏
.avue-logo {
- background-color: #409eff !important;
- color: #fff !important;
+ background-color: #409eff !important;
+ color: #fff !important;
}
.avue-sidebar {
- background-color: #fff !important;
+ background-color: #fff !important;
}
.avue-header {
- background-color: #409eff !important;
- color: #fff !important;
+ background-color: #409eff !important;
+ color: #fff !important;
}
.avue-sidebar .el-menu-item span,
.avue-sidebar .el-submenu__title span,
.avue-sidebar .el-submenu__title i,
.avue-sidebar .el-menu-item i {
- color: rgba($color: #000000, $alpha: 0.8) !important;
+ color: rgba($color: #000000, $alpha: 0.8) !important;
}
// 菜单 活动背景
.avue-sidebar .el-menu-item.is-active {
- background-color: #409eff !important;
+ background-color: #409eff !important;
}
.avue-sidebar .el-menu-item.is-active span,
.el-menu-item.is-active i {
- color: #fff !important;
+ color: #fff !important;
}
//top 导航 按钮
.el-menu--horizontal > .el-menu-item.is-active,
.avue-top,
.el-dropdown {
- color: #fff !important;
+ color: #fff !important;
}
.securityPapers {
- width: 100%;
- height: 100%;
- background-color: #f4f6f8;
- position: absolute;
- top: 40px;
- left: 0;
+ width: 100%;
+ height: 100%;
+ background-color: #f4f6f8;
+ position: absolute;
+ top: 40px;
+ left: 0;
}
.securityGuard .avue-form__menu {
- position: relative;
- width: 100%;
- display: flex;
- flex-direction: row-reverse;
+ position: relative;
+ width: 100%;
+ display: flex;
+ flex-direction: row-reverse;
}
.businessLicense .avue-upload__avatar,
.businessLicense .avue-upload__icon {
- // 图片
- width: 450px !important;
- height: 680px !important;
- line-height: 680px !important;
+ // 图片
+ width: 450px !important;
+ height: 680px !important;
+ line-height: 680px !important;
}
.License .avue-upload__avatar,
.License .avue-upload__icon {
- // 图片
- width: 1048px !important;
- height: 680px !important;
- line-height: 680px !important;
+ // 图片
+ width: 1048px !important;
+ height: 680px !important;
+ line-height: 680px !important;
}
//保安员管理 查看按钮放前
@@ -286,53 +286,78 @@
// position: relative;
// right: 70px;
// }
-.securityGuard .el-button.el-button--text.el-button--small:nth-child(1) {
- position: relative;
- right: 70px;
-}
+// .securityGuard .el-button.el-button--text.el-button--small:nth-child(1) {
+// position: relative;
+// right: 70px;
+// }
.avue-empty__desc {
- color: #fff !important;
+ color: #fff !important;
}
.certificateTJ .avue-form__menu--center {
- // 统计图持证表格按钮过长
- width: 320px !important;
+ // 统计图持证表格按钮过长
+ width: 320px !important;
}
.el-menu.el-menu--popup.el-menu--popup-right-start {
- //菜单折叠 弹窗样式
- .el-menu-item span,
- .el-menu-item i {
- color: rgba($color: #000000, $alpha: 0.7) !important;
- }
- li:hover {
- background-color: #bcdcfd !important;
- }
+ //菜单折叠 弹窗样式
+ .el-menu-item span,
+ .el-menu-item i {
+ color: rgba($color: #000000, $alpha: 0.7) !important;
+ }
+ li:hover {
+ background-color: #bcdcfd !important;
+ }
}
.addCompany {
- .avue-form__menu--center .el-button {
- float: none;
- }
+ .avue-form__menu--center .el-button {
+ float: none;
+ }
}
.avue-form__group > div:last-child {
- display: inline-block !important;
- // width: auto !important;
+ display: inline-block !important;
+ // width: auto !important;
}
// 表格搜索按钮样式覆盖
-@import "./tableSearchBut.scss";
+// @import "./tableSearchBut.scss";
+
+//用户手册
.userSManual .el-card.basic-container__card.is-always-shadow,
.userSManual .el-card__body {
- width: 100% !important;
- height: 100% !important;
- box-sizing: border-box !important;
+ width: 100% !important;
+ height: 100% !important;
+ box-sizing: border-box !important;
}
// 整体缩放
-body {
- zoom: 0.997;
- // font-size: xx-small;
+// body {
+// zoom: 0.997;
+// // font-size: xx-small;
+// }
+
+@import "./smallSize.scss";
+
+//表格操作栏
+.el-tooltip__popper.is-light.caozuolanpopper {
+ padding-left: 0;
+ padding-right: 0;
+ border: 1px solid #409eff;
+ &[x-placement^=bottom] .popper__arrow {
+ border-bottom-color: #409eff !important;
+ }
+ &[x-placement^=top] .popper__arrow {
+ border-top-color: #409eff !important;
+ }
+ .el-button.el-button--text.el-button--small {
+ padding-left: 10px;
+ padding-right: 10px;
+ &:hover {
+ background-color: #409eff;
+ color: #fff;
+ }
+ }
}
diff --git a/src/styles/smallSize.scss b/src/styles/smallSize.scss
new file mode 100644
index 0000000..4c8dc3a
--- /dev/null
+++ b/src/styles/smallSize.scss
@@ -0,0 +1,111 @@
+.tooRowSearch1 {
+ position: relative;
+
+ // .avue-form__group {
+ // position: relative;
+ // z-index: 100;
+ // }
+}
+.tooRowSearch1 .avue-crud__search .avue-form__group.avue-form__group--flex .avue-form__menu--center {
+ width: 240px !important;
+ // width: 264px !important;
+ // position: absolute !important;
+ // right: 0 !important;
+ // top: 126px !important;
+ // z-index: 100 !important;
+ // width: 264px;
+ position: absolute;
+ right: -8px;
+ top: 80px;
+ z-index: 100;
+ .el-button.el-button--text.el-button--small {
+ position: fixed;
+ top: 140px;
+ right: 40px;
+ }
+}
+.certificateTJ .avue-crud__search .avue-form__group.avue-form__group--flex .avue-form__menu--center {
+ //适配在保安单位情况智能分析中的弹出表格的按钮过下问题
+ top: 57px !important;
+}
+.tooRowSearch1 .el-card.is-never-shadow.avue-crud__search {
+ overflow: visible;
+}
+
+.smallSize {
+ //设置1366*768中的表格边距
+ //搜索框
+ .el-collapse .el-collapse-item {
+ padding-top: 0px !important;
+ .el-col {
+ margin-top: 2px;
+ margin-bottom: 8px;
+ }
+ .el-form-item--small.el-form-item {
+ margin-bottom: 10px;
+ .el-form-item__label {
+ width: auto !important;
+ }
+ }
+ }
+ .avue-crud__menu {
+ margin-bottom: 0 !important;
+ }
+ //选择选项横条
+ .avue-crud__tip {
+ .avue-crud__tip {
+ margin: 3px 0;
+ }
+ }
+ .el-card__body {
+ //卡片减少padding
+ padding: 8px !important;
+ .el-card__body {
+ padding: 0 8px 8px 8px !important;
+ }
+ }
+ //分页器
+ .avue-crud__pagination {
+ padding: 10px 0 5px 5px;
+ }
+}
+
+.normalSize {
+ //设置正常的表格边距
+ //搜索框
+ .el-collapse .el-collapse-item {
+ padding-top: 10px !important;
+ .el-col {
+ margin-bottom: 8px !important;
+ }
+ .el-form-item--small.el-form-item {
+ margin-bottom: 15px;
+ .el-form-item__label {
+ width: auto !important;
+ }
+ }
+ }
+ //选择选项横条
+ .avue-crud__tip {
+ .avue-crud__tip {
+ margin: 6px 0;
+ }
+ }
+ .el-card__body {
+ //卡片减少padding
+ padding: 8px !important;
+ }
+ //分页器
+ .avue-crud__pagination {
+ padding: 15px 0 5px 5px;
+ }
+}
+//单独设置 在/traincompany/index页面
+.exam-card-body-big .el-card__body:nth-child(1) {
+ padding: 11px !important;
+}
+
+//单独设置 在/traincompany/index页面
+.morpheus-box .el-card__body:nth-child(1) {
+ padding: 9px !important;
+}
diff --git a/src/views/accreditationRecords/accreditationRecords.vue b/src/views/accreditationRecords/accreditationRecords.vue
index 1ba60fc..f0180b0 100644
--- a/src/views/accreditationRecords/accreditationRecords.vue
+++ b/src/views/accreditationRecords/accreditationRecords.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'desk1',
- $store.state.control.windowWidth >= 1024 ? 'tooRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -157,7 +159,7 @@
getAccreditationRecords,
batchAccreditation,
audit,
- batchAudit,
+ batchAudit
} from "@/api/accreditationRecords/accreditationRecords";
import { getDept } from "@/api/system/dept";
import { mapGetters } from "vuex";
@@ -167,23 +169,23 @@
import Legend from "@/components/liu-legend/Legend";
export default {
components: {
- Legend,
+ Legend
},
data() {
return {
datalistLIU: [
{
color: "#29C093",
- text: "审核通过",
+ text: "审核通过"
},
{
color: "#F34A4A",
- text: "审核不通过",
+ text: "审核不通过"
},
{
color: "#F48F57",
- text: "待审核",
- },
+ text: "待审核"
+ }
],
check: false,
form: {},
@@ -200,7 +202,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
Audit: {},
dialogFormVisible: false,
@@ -238,34 +240,34 @@
{
required: true,
message: "请选择审核类型",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
span: 24,
type: "textarea",
- prop: "auditDetail",
- },
- ],
+ prop: "auditDetail"
+ }
+ ]
},
batchAudit: {
- number: 0,
+ number: 0
},
optionBatchAudit: {
height: "auto",
@@ -291,7 +293,7 @@
span: 24,
value: 0,
disabled: true,
- labelWidth: 110,
+ labelWidth: 110
},
{
label: "审核状态",
@@ -307,31 +309,31 @@
{
required: true,
message: "请选择审核类型",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
span: 24,
type: "textarea",
- prop: "auditDetail",
- },
- ],
+ prop: "auditDetail"
+ }
+ ]
},
choiceList: [],
selectionList: [],
@@ -357,6 +359,7 @@
menuWidth: 210,
dialogClickModal: false,
...this.$store.state.control.clearOtherBut,
+ searchIndex: 5, //收缩展示数量
column: [
{
label: "申请时间",
@@ -375,9 +378,9 @@
{
required: true,
message: "请输入申请时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "姓名",
@@ -385,7 +388,7 @@
search: true,
searchSpan: 3,
width: 100,
- searchLabelWidth: 50,
+ searchLabelWidth: 50
// display: false,
},
// {
@@ -409,20 +412,20 @@
// },
{
label: "企业名称",
- searchLabelWidth: "110",
+ searchLabelWidth: "90",
prop: "deptName",
slot: true,
searchSpan: 5,
search: true,
overHidden: true,
- minWidth: 160,
+ minWidth: 160
},
{
label: "性别",
prop: "sex",
width: 80,
type: "select",
- display: false,
+ display: false
},
{
label: "身份证号码",
@@ -430,19 +433,19 @@
search: true,
searchLabelWidth: 90,
searchSpan: 5,
- width:140,
+ width: 140
},
{
label: "年龄",
prop: "age",
- width:60,
+ width: 60
},
{
label: "照片",
prop: "avatar",
type: "upload",
listType: "picture-img",
- width:60
+ width: 60
},
{
label: "保安证编号",
@@ -450,9 +453,9 @@
search: true,
searchLabelWidth: 90,
width: 110,
- searchSpan: 5,
+ searchSpan: 4,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
@@ -464,7 +467,7 @@
minWidth: 80,
// searchSpan: 4,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
{
@@ -473,9 +476,9 @@
search: true,
searchLabelWidth: 120,
minWidth: 120,
- searchSpan: 5,
+ searchSpan: 4,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
{
@@ -486,7 +489,7 @@
width: 140,
// searchSpan: 4,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
{
@@ -504,17 +507,17 @@
dicData: [
{
label: "全部",
- value: 3,
+ value: 3
},
{
label: "有",
- value: 1,
+ value: 1
},
{
label: "无",
- value: 2,
- },
- ],
+ value: 2
+ }
+ ]
},
{
label: "审核状态",
@@ -531,17 +534,17 @@
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
@@ -550,7 +553,7 @@
addDisplay: false,
editDisplay: false,
hide: false,
- display: false,
+ display: false
},
{
label: "是否制证",
@@ -565,21 +568,21 @@
dicData: [
{
label: "全部",
- value: 3,
+ value: 3
},
{
label: "已制证",
- value: 2,
+ value: 2
},
{
label: "未制证",
- value: 1,
- },
- ],
- },
- ],
+ value: 1
+ }
+ ]
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -595,31 +598,31 @@
this.permission.accreditationRecords_delete,
false
),
- editBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
- }),
+ userInfo: state => state.user.userInfo
+ })
},
mounted() {
this.getDeptInfo(this.userInfo.dept_id);
+ this.$store.commit("setWindowSizeHeightAdd");
},
created() {
if (this.userInfo.role_name == "上岗证办理管理员") {
this.questionBankSearch["status"] = 1;
this.questionBankSearch["auditStatus"] = 2;
- this.option.reserveSelection= false;
- this.option.tip= false;
- this.option.selection= false;
-
+ this.option.reserveSelection = false;
+ this.option.tip = false;
+ this.option.selection = false;
}
if (this.userInfo.role_name == "公安管理员") {
//判断是否为市局管理员
@@ -640,10 +643,10 @@
submit(row, done, loading) {
const data = {
id: row.id,
- type:1,
+ type: 1,
auditStatus: row.auditStatus,
auditDetail: row.auditDetail,
- auditUser: this.userInfo.Id,
+ auditUser: this.userInfo.Id
};
audit(data).then(
@@ -652,11 +655,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -667,7 +670,7 @@
if (this.choiceList.length == 0) {
this.$message({
message: "未选择保安员",
- type: "warning",
+ type: "warning"
});
return;
}
@@ -690,7 +693,7 @@
type: 1,
auditStatus: row.auditStatus,
auditDetail: row.auditDetail,
- auditUser: this.userInfo.Id,
+ auditUser: this.userInfo.Id
};
//提交申请
batchAudit(data).then(
@@ -700,13 +703,13 @@
that.dialogBatchAudit = false;
this.$message({
type: "success",
- message: "操作成功",
+ message: "操作成功"
});
//清除选项
that.$refs.crud.toggleSelection();
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -718,14 +721,11 @@
this.$message.warning("请勾选至少一位持证保安员");
return;
}
- this.$confirm(
- "共选择人数" + this.choiceList.length + "人,确定已制证?",
- {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning",
- }
- )
+ this.$confirm("共选择人数" + this.choiceList.length + "人,确定已制证?", {
+ confirmButtonText: "确定",
+ cancelButtonText: "取消",
+ type: "warning"
+ })
.then(() => {
let cho = this.choiceList;
let str = "";
@@ -738,7 +738,7 @@
const data = {
ids: str,
createUser: this.userInfo.user_id,
- type: 1,
+ type: 1
};
return batchAccreditation(data);
})
@@ -747,14 +747,14 @@
this.$refs.crud.toggleSelection();
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
//获取当前用户部门信息
getDeptInfo(deptId) {
var that = this;
- getDept(deptId).then((res) => {
+ getDept(deptId).then(res => {
var deptCategory = res.data.data.deptCategory;
deptCategory == 1
? (that.deptCategory = true)
@@ -767,8 +767,8 @@
path: `/resource/uploadNotice`,
query: {
deptId: row.deptId,
- noticeId: row.id,
- },
+ noticeId: row.id
+ }
});
},
rowSave(row, done, loading) {
@@ -784,11 +784,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -806,11 +806,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -820,7 +820,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -829,7 +829,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -848,7 +848,7 @@
this.choiceList = [];
for (let k in list) {
this.choiceList.push({
- id: list[k].id,
+ id: list[k].id
});
}
},
@@ -864,7 +864,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -873,14 +873,14 @@
this.onLoad(this.page, this.questionBankSearch);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getAccreditationRecords(this.form.id).then((res) => {
+ getAccreditationRecords(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -916,23 +916,24 @@
params["jurisdiction"] = this.userInfo.jurisdiction;
}
let values = {
- ...params,
+ ...params
};
if (releaseTimeRange) {
values = {
...params,
startTime: releaseTimeRange[0],
endTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
values.releaseTimeRange = null;
}
this.loading = true;
- getList(page.currentPage, page.pageSize, values).then((res) => {
+ getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -941,7 +942,7 @@
this.$confirm("是否导出保安员证信息数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
//获取查询条件
const { releaseTimeRange } = this.questionBankSearch;
@@ -960,7 +961,7 @@
startTime: this.questionBankSearch.startTime,
endTime: this.questionBankSearch.endTime,
isAvatar: this.questionBankSearch.isAvatar,
- status: this.questionBankSearch.status,
+ status: this.questionBankSearch.status
};
//导出
if (this.userInfo.role_name == "保安公司管理员") {
@@ -983,8 +984,8 @@
}=${getToken()}&` + data
);
});
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/accreditationRecords/accreditationRecordsPaper.vue b/src/views/accreditationRecords/accreditationRecordsPaper.vue
index e35a4bd..140c76e 100644
--- a/src/views/accreditationRecords/accreditationRecordsPaper.vue
+++ b/src/views/accreditationRecords/accreditationRecordsPaper.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'desk1',
- $store.state.control.windowWidth >= 1024 ? 'tooRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -80,9 +82,9 @@
>批量审批
</el-button>
<!--图例 components-->
- <span>
- <Legend :datas="datalistLIU"></Legend>
- </span>
+ <span>
+ <Legend :datas="datalistLIU"></Legend>
+ </span>
</template>
<template slot-scope="{ row }" slot="category">
<el-tag>{{ row.categoryName }}</el-tag>
@@ -215,7 +217,7 @@
add,
getAccreditationRecords,
audit,
- batchAudit,
+ batchAudit
} from "@/api/accreditationRecords/accreditationRecords";
import { updatePaperTime } from "@/api/system/user";
import { getDept } from "@/api/system/dept";
@@ -226,7 +228,7 @@
import Legend from "@/components/liu-legend/Legend";
export default {
components: {
- Legend,
+ Legend
},
data() {
return {
@@ -238,21 +240,21 @@
realName: "",
securityNumber: "",
idCardNo: "",
- registered: "",
+ registered: ""
},
datalistLIU: [
{
color: "#29C093",
- text: "审核通过",
+ text: "审核通过"
},
{
color: "#F34A4A",
- text: "审核不通过",
+ text: "审核不通过"
},
{
color: "#F48F57",
- text: "待审核",
- },
+ text: "待审核"
+ }
],
Audit: {},
dialogFormVisible: false,
@@ -290,34 +292,34 @@
{
required: true,
message: "请选择审核类型",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
span: 24,
type: "textarea",
- prop: "auditDetail",
- },
- ],
+ prop: "auditDetail"
+ }
+ ]
},
batchAudit: {
- number: 0,
+ number: 0
},
optionBatchAudit: {
height: "auto",
@@ -343,7 +345,7 @@
span: 24,
value: 0,
disabled: true,
- labelWidth: 110,
+ labelWidth: 110
},
{
label: "审核状态",
@@ -359,31 +361,31 @@
{
required: true,
message: "请选择审核类型",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
span: 24,
type: "textarea",
- prop: "auditDetail",
- },
- ],
+ prop: "auditDetail"
+ }
+ ]
},
choiceList: [],
form: {},
@@ -400,7 +402,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -426,6 +428,7 @@
menuWidth: 180,
dialogClickModal: false,
...this.$store.state.control.clearOtherBut,
+ searchIndex: 5, //收缩展示数量
column: [
{
label: "申请时间",
@@ -444,9 +447,9 @@
{
required: true,
message: "请输入申请时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "姓名",
@@ -454,7 +457,7 @@
search: true,
searchSpan: 3,
width: 90,
- searchLabelWidth: 50,
+ searchLabelWidth: 50
// display: false,
},
// {
@@ -489,14 +492,14 @@
searchSpan: 5,
search: true,
overHidden: true,
- minWidth: 200,
+ minWidth: 200
},
{
label: "性别",
prop: "sex",
width: 60,
type: "select",
- display: false,
+ display: false
},
{
label: "身份证号码",
@@ -504,19 +507,19 @@
search: true,
searchLabelWidth: 90,
minWidth: 110,
- searchSpan: 5,
+ searchSpan: 5
},
{
label: "年龄",
prop: "age",
- width: 50,
+ width: 50
},
{
label: "照片",
prop: "avatar",
type: "upload",
listType: "picture-img",
- width:60,
+ width: 60
},
{
label: "保安证编号",
@@ -524,9 +527,9 @@
search: true,
searchLabelWidth: 90,
minWidth: 90,
- searchSpan: 5,
+ searchSpan: 4,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
{
@@ -537,7 +540,7 @@
width: 80,
// searchSpan: 4,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
{
@@ -548,7 +551,7 @@
minWidth: 160,
searchSpan: 5,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
{
@@ -559,7 +562,7 @@
minWidth: 105,
// searchSpan: 4,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
},
{
@@ -577,17 +580,17 @@
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
@@ -596,7 +599,7 @@
addDisplay: false,
editDisplay: false,
hide: false,
- display: false,
+ display: false
},
{
label: "是否制证",
@@ -611,17 +614,17 @@
dicData: [
{
label: "全部",
- value: 3,
+ value: 3
},
{
label: "已制证",
- value: 2,
+ value: 2
},
{
label: "未制证",
- value: 1,
- },
- ],
+ value: 1
+ }
+ ]
},
{
label: "有无照片",
@@ -638,21 +641,21 @@
dicData: [
{
label: "全部",
- value: 3,
+ value: 3
},
{
label: "有",
- value: 1,
+ value: 1
},
{
label: "无",
- value: 2,
- },
- ],
- },
- ],
+ value: 2
+ }
+ ]
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -665,22 +668,23 @@
false
),
delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
- }),
+ userInfo: state => state.user.userInfo
+ })
},
mounted() {
this.getDeptInfo(this.userInfo.dept_id);
+ this.$store.commit("setWindowSizeHeightAdd");
// if (this.userInfo.roleName == "办证管理员") {
// this.search["userType"] = 7;
// }
@@ -705,7 +709,7 @@
//获取当前用户部门信息
getDeptInfo(deptId) {
var that = this;
- getDept(deptId).then((res) => {
+ getDept(deptId).then(res => {
var deptCategory = res.data.data.deptCategory;
deptCategory == 1
? (that.deptCategory = true)
@@ -718,8 +722,8 @@
path: `/resource/uploadNotice`,
query: {
deptId: row.deptId,
- noticeId: row.id,
- },
+ noticeId: row.id
+ }
});
},
rowSave(row, done, loading) {
@@ -735,11 +739,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -783,7 +787,7 @@
onEnd: () => {
this.updateUserInfo();
// console.log('打印完成', Date.parse(new Date()));
- },
+ }
});
},
getNewTime() {
@@ -819,7 +823,7 @@
const data = {
id: this.certificateObj.userId,
userType: 6,
- paperTime: date,
+ paperTime: date
};
updatePaperTime(data);
this.onLoad(this.page);
@@ -840,7 +844,7 @@
type: 2,
auditStatus: row.auditStatus,
auditDetail: row.auditDetail,
- auditUser: this.userInfo.Id,
+ auditUser: this.userInfo.Id
};
//提交申请
batchAudit(data).then(
@@ -850,13 +854,13 @@
that.dialogBatchAudit = false;
this.$message({
type: "success",
- message: "操作成功",
+ message: "操作成功"
});
//清除选项
that.$refs.crud.toggleSelection();
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -874,11 +878,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -889,7 +893,7 @@
if (this.choiceList.length == 0) {
this.$message({
message: "未选择保安员",
- type: "warning",
+ type: "warning"
});
return;
}
@@ -900,7 +904,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -909,7 +913,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -926,10 +930,10 @@
submit(row, done, loading) {
const data = {
id: row.id,
- type:2,
+ type: 2,
auditStatus: row.auditStatus,
auditDetail: row.auditDetail,
- auditUser: this.userInfo.Id,
+ auditUser: this.userInfo.Id
};
audit(data).then(
@@ -938,11 +942,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -959,7 +963,7 @@
this.choiceList = [];
for (let k in list) {
this.choiceList.push({
- id: list[k].id,
+ id: list[k].id
});
}
},
@@ -976,7 +980,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -985,14 +989,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getAccreditationRecords(this.form.id).then((res) => {
+ getAccreditationRecords(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -1029,23 +1033,24 @@
params["jurisdiction"] = this.userInfo.jurisdiction;
}
let values = {
- ...params,
+ ...params
};
if (releaseTimeRange) {
values = {
...params,
startTime: releaseTimeRange[0],
endTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
values.releaseTimeRange = null;
}
this.loading = true;
- getList(page.currentPage, page.pageSize, values).then((res) => {
+ getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -1054,7 +1059,7 @@
this.$confirm("是否导出证书制证信息数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
//获取查询条件
const { releaseTimeRange } = this.questionBankSearch;
@@ -1073,7 +1078,7 @@
securityNumber: this.questionBankSearch.securityNumber,
startTime: this.questionBankSearch.startTime,
endTime: this.questionBankSearch.endTime,
- isAvatar: this.questionBankSearch.isAvatar,
+ isAvatar: this.questionBankSearch.isAvatar
};
// data['Blade-Auth'] = getToken;
//导出
@@ -1103,7 +1108,7 @@
this.$confirm("是否导出证书打印信息数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
//获取查询条件
const { releaseTimeRange } = this.questionBankSearch;
@@ -1122,7 +1127,7 @@
securityNumber: this.questionBankSearch.securityNumber,
startTime: this.questionBankSearch.startTime,
endTime: this.questionBankSearch.endTime,
- isAvatar: this.questionBankSearch.isAvatar,
+ isAvatar: this.questionBankSearch.isAvatar
};
//导出
if (this.userInfo.role_name == "保安公司管理员") {
@@ -1145,8 +1150,8 @@
}=${getToken()}&` + data
);
});
- },
- },
+ }
+ }
};
</script>
@@ -1357,7 +1362,6 @@
line-height: 40px;
letter-spacing: 2px;
}
-
.dtype {
width: 100%;
diff --git a/src/views/applyexam/index.vue b/src/views/applyexam/index.vue
index 9f8dab8..5b877c7 100644
--- a/src/views/applyexam/index.vue
+++ b/src/views/applyexam/index.vue
@@ -1,46 +1,33 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-05 16:31:54
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-23 14:19:17
- * menu-name 报名考试
- */
+/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
+@Last Modified time: 2021-11-23 14:19:17 * menu-name 报名考试 */
<template>
- <el-row class="morpheus-box-apply-exam">
- <el-col
- :span="24"
- :class="[
- 'hasButOne',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ v-model="obj"
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ ref="questionBankCrud"
+ :page.sync="questionBankPage"
+ @on-load="questionBankOnLoad"
+ @selection-change="questionBankSelectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-save="questionBankRowSave"
+ @row-del="questionBankRowDel"
>
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
- >
- <avue-crud
- v-model="obj"
- class="company-box"
- :option="questionBankOption"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- ref="questionBankCrud"
- :page.sync="questionBankPage"
- @on-load="questionBankOnLoad"
- @selection-change="questionBankSelectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-save="questionBankRowSave"
- @row-del="questionBankRowDel"
- >
- <!-- 自定义按钮 -->
- <!-- <template slot="menuLeft">
+ <!-- 自定义按钮 -->
+ <!-- <template slot="menuLeft">
<el-button type="danger"
size="mini"
icon="el-icon-delete"
@@ -61,124 +48,121 @@
</el-button>
</template> -->
- <!-- <template slot="menuLeft">
+ <!-- <template slot="menuLeft">
<el-button type="danger"
size="small"
icon="el-icon-delete"
@click="questionBankHandleDelete">删 除
</el-button>
</template> -->
- <!-- 自定义按钮 -->
- <template slot="menuLeft">
- <el-button
- type="primary"
- size="small"
- plain
- icon="el-icon-folder-checked"
- @click="handleBatchExam"
- v-if="permission.applyexam_exam"
- >生成考试
- </el-button>
- <!-- v-if="examPersission" -->
- <el-button
- type="primary"
- size="small"
- plain
- icon="el-icon-folder-checked"
- v-if="permission.applyexam_import"
- @click="handleImport"
- >批量报名
- </el-button>
- </template>
+ <!-- 自定义按钮 -->
+ <template slot="menuLeft">
+ <el-button
+ type="primary"
+ size="small"
+ plain
+ icon="el-icon-folder-checked"
+ @click="handleBatchExam"
+ v-if="permission.applyexam_exam"
+ >生成考试
+ </el-button>
+ <!-- v-if="examPersission" -->
+ <el-button
+ type="primary"
+ size="small"
+ plain
+ icon="el-icon-folder-checked"
+ v-if="permission.applyexam_import"
+ @click="handleImport"
+ >批量报名
+ </el-button>
+ </template>
- <template slot-scope="{ type, row }" slot="menu">
- <el-button
- :type="type"
- size="small"
- icon="el-icon-refresh-left"
- v-if="permission.applyexam_cancel"
- :disabled="row.isApply == 2"
- @click="handleCancel(row)"
- >取消报名
- </el-button>
- <el-button
- style="display: none"
- :type="type"
- size="small"
- icon="el-icon-folder-checked"
- :disabled="row.applyStatus == 4"
- @click="handleAudit(row)"
- >审核
- </el-button>
- <el-button
- :type="type"
- size="small"
- icon="el-icon-receiving"
- v-if="permission.applyexam_print && row.candidateNo != ''"
- @click="handlePrint(row)"
- >准考证打印
- </el-button>
- </template>
+ <template slot-scope="{ type, row }" slot="menu">
+ <el-button
+ :type="type"
+ size="small"
+ icon="el-icon-refresh-left"
+ v-if="permission.applyexam_cancel"
+ :disabled="row.isApply == 2"
+ @click="handleCancel(row)"
+ >取消报名
+ </el-button>
+ <el-button
+ style="display: none"
+ :type="type"
+ size="small"
+ icon="el-icon-folder-checked"
+ :disabled="row.applyStatus == 4"
+ @click="handleAudit(row)"
+ >审核
+ </el-button>
+ <el-button
+ :type="type"
+ size="small"
+ icon="el-icon-receiving"
+ v-if="permission.applyexam_print && row.candidateNo != ''"
+ @click="handlePrint(row)"
+ >准考证打印
+ </el-button>
+ </template>
- <template slot-scope="{ row }" slot="age">
- {{ row.age == -1 ? "" : row.age }}
- </template>
- </avue-crud>
+ <template slot-scope="{ row }" slot="age">
+ {{ row.age == -1 ? "" : row.age }}
+ </template>
+ </avue-crud>
- <el-dialog
- title="考试资格审核"
- :visible.sync="dialogFormVisible"
- modal-append-to-body="false"
- append-to-body="true"
- :close-on-click-model="true"
- >
- <avue-form
- ref="formAudit"
- v-model="Audit"
- :option="optionAudit"
- @reset-change="emptytChange"
- @submit="submit"
- ></avue-form>
- </el-dialog>
+ <el-dialog
+ title="考试资格审核"
+ :visible.sync="dialogFormVisible"
+ modal-append-to-body="false"
+ append-to-body="true"
+ :close-on-click-model="true"
+ >
+ <avue-form
+ ref="formAudit"
+ v-model="Audit"
+ :option="optionAudit"
+ @reset-change="emptytChange"
+ @submit="submit"
+ ></avue-form>
+ </el-dialog>
- <el-dialog
- title="批量报名导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px"
- >
- <avue-form
- :option="excelOption"
- v-model="excelForm"
- :upload-after="uploadAfter"
- >
- <template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
- 点击下载<i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog>
+ <el-dialog
+ title="批量报名导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
+ >
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
+ </avue-form>
+ </el-dialog>
- <el-dialog
- title="考试生成"
- append-to-body
- :visible.sync="dialogExamFormVisible"
- width="900px"
- @close="closeDialog"
- >
- <avue-form
- ref="formExamApply"
- v-model="examApply"
- :option="optionExamApply"
- @reset-change="emptytChange"
- @submit="submitExamApply"
- ></avue-form>
- </el-dialog>
- </div>
- </el-card>
- </el-col>
- </el-row>
+ <el-dialog
+ title="考试生成"
+ append-to-body
+ :visible.sync="dialogExamFormVisible"
+ width="900px"
+ @close="closeDialog"
+ >
+ <avue-form
+ ref="formExamApply"
+ v-model="examApply"
+ :option="optionExamApply"
+ @reset-change="emptytChange"
+ @submit="submitExamApply"
+ ></avue-form>
+ </el-dialog>
+ </basic-container>
</template>
<script>
@@ -187,7 +171,7 @@
addApply,
cancelApply,
remove,
- addExam,
+ addExam
} from "@/api/examapi/applyexam";
import { mapState } from "vuex";
import { mapGetters } from "vuex";
@@ -196,13 +180,13 @@
applyStatus: [
{
label: "已报名",
- value: 2,
+ value: 2
},
{
label: "已取消",
- value: 4,
- },
- ],
+ value: 4
+ }
+ ]
};
export default {
@@ -227,18 +211,18 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/apply/import-apply",
+ action: "/api/apply/import-apply"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
optionAudit: {
height: "auto",
@@ -272,27 +256,27 @@
{
required: true,
message: "请选择审核类型",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
dicData: [
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
span: 24,
type: "textarea",
- prop: "auditDetail",
- },
- ],
+ prop: "auditDetail"
+ }
+ ]
},
optionExamApply: {
height: "auto",
@@ -323,18 +307,18 @@
type: "number",
max: 1000,
min: 0,
- precision: 0,
+ precision: 0
},
rules: [
{
required: true,
message: "请输入考试人数",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
minRows: 0,
maxRows: 1000,
- value: 50,
+ value: 50
},
{
label: "序号开始",
@@ -345,7 +329,7 @@
type: "number",
max: 1000,
min: 1,
- precision: 0,
+ precision: 0
},
minRows: 1,
maxRows: 1000,
@@ -354,9 +338,9 @@
{
required: true,
message: "请输入序号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "序号结束",
@@ -367,7 +351,7 @@
type: "number",
max: 1000,
min: 1,
- precision: 0,
+ precision: 0
},
minRows: 1,
maxRows: 1000,
@@ -376,9 +360,9 @@
{
required: true,
message: "请输入序号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "考试时间",
@@ -402,10 +386,10 @@
{
required: true,
message: "请选择考试时间",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- span: 12,
+ span: 12
},
{
label: "截止时间",
@@ -429,12 +413,12 @@
{
required: true,
message: "请选择考试时间",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- span: 12,
- },
- ],
+ span: 12
+ }
+ ]
},
questionBankOption: {
// 操作栏多余按钮去除
@@ -489,16 +473,16 @@
editDetail: false,
props: {
label: "title",
- value: "id",
+ value: "id"
},
rules: [
{
required: true,
message: "请选择保安姓名",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 80,
+ width: 80
},
{
label: "保安姓名",
@@ -520,15 +504,15 @@
viewDisplay: true,
props: {
label: "title",
- value: "id",
+ value: "id"
},
rules: [
{
required: true,
message: "请选择保安姓名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "年龄",
@@ -546,7 +530,7 @@
editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
- viewDisplay: true,
+ viewDisplay: true
},
// {
// label: "考试名称",
@@ -602,10 +586,10 @@
{
required: true,
message: "请选择所属公司",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 220,
+ width: 220
},
{
label: "准考证号",
@@ -627,10 +611,10 @@
{
required: true,
message: "请选择准考证号",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 100,
+ width: 100
},
{
label: "身份证号",
@@ -652,10 +636,10 @@
{
required: true,
message: "请选择准考证号",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 150,
+ width: 150
},
{
label: "报考证件",
@@ -677,9 +661,9 @@
{
required: true,
message: "请选择准考证号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
// {
// label: "试卷分数",
@@ -740,8 +724,8 @@
? "0" + new Date().getSeconds()
: new Date().getSeconds()),
- width: 150,
- },
+ width: 150
+ }
// {
// label: "考试时间",
// prop: "examTime",
@@ -841,7 +825,7 @@
// addDisplay: false,
// width: 100,
// },
- ],
+ ]
},
questionBankSearch: {},
questionBankLoading: true,
@@ -850,10 +834,10 @@
pageSize: 10,
currentPage: 1,
total: 16,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
questionBankQuery: {},
- questionBankSelectionList: [],
+ questionBankSelectionList: []
};
},
@@ -878,8 +862,8 @@
}
}
},
- immediate: true,
- },
+ immediate: true
+ }
},
created() {
if (this.userInfo.role_name.indexOf("ksxtadmin") != -1) {
@@ -888,10 +872,12 @@
this.questionBankSearch["applyStatus"] = 2;
},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
computed: {
...mapState({
- userInfo: (state) => state.user.userInfo,
+ userInfo: state => state.user.userInfo
}),
...mapGetters(["userInfo", "permission"]),
permissionList() {
@@ -899,16 +885,16 @@
addBtn: this.vaildData(null, false),
viewBtn: this.vaildData(this.permission.applyexam_view, false),
delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false)
};
},
ids() {
let ids = [];
- this.questionBankSelectionList.forEach((ele) => {
+ this.questionBankSelectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
methods: {
//准考证查看
@@ -917,7 +903,7 @@
obj["name"] = "准考证信息";
this.$router.push({
path: `/applyexam/papers`,
- query: obj,
+ query: obj
});
},
questionBankOnLoad(page, params = {}) {
@@ -928,8 +914,8 @@
var that = this;
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
+ roleIds.forEach(roleId => {
+ getRoleDetail(roleId).then(res => {
var roleAlias = res.data.data.roleAlias;
if (roleAlias == "保安公司管理员" || roleAlias == "保安") {
//如果是保安公司管理员
@@ -939,11 +925,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.questionBankQuery)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.questionBankPage.total = data.total;
this.questionBankData = data.records;
this.questionBankLoading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.questionBankSelectionClear();
});
});
@@ -979,29 +966,29 @@
addApply({
userId: row.userId,
examId: row.examName,
- applyTime: row.applyTime,
+ applyTime: row.applyTime
}).then(
- (res) => {
+ res => {
this.questionBankOnLoad(this.questionBankPage);
if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "已报名，不能重复报名",
+ message: "已报名，不能重复报名"
});
} else if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "报名失败",
+ message: "报名失败"
});
} else {
this.$message({
type: "success",
- message: "报名成功",
+ message: "报名成功"
});
}
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -1023,7 +1010,7 @@
if (row.number != row.serialEnd - row.serialStart + 1) {
this.$message({
type: "error",
- message: "考试人数与序号不匹配!",
+ message: "考试人数与序号不匹配!"
});
done();
return;
@@ -1034,7 +1021,7 @@
if (s > e) {
this.$message({
type: "error",
- message: "截止时间不能早于考试考试开始时间!",
+ message: "截止时间不能早于考试考试开始时间!"
});
done();
return;
@@ -1044,13 +1031,13 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
that.$refs.formExamApply.resetFields();
that.dialogExamFormVisible = false;
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -1065,7 +1052,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -1074,7 +1061,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -1084,7 +1071,7 @@
this.$confirm("确定取消报名?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
row.applyStatus = 4;
@@ -1094,7 +1081,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -1107,7 +1094,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -1116,7 +1103,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.questionBankCrud.toggleSelection();
});
@@ -1142,10 +1129,9 @@
refreshChange() {
this.questionBankOnLoad(this.page, this.query);
- },
- },
+ }
+ }
};
</script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/authority/apiscope.vue b/src/views/authority/apiscope.vue
index ed2a780..6fc1ac1 100644
--- a/src/views/authority/apiscope.vue
+++ b/src/views/authority/apiscope.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -92,14 +96,14 @@
remove,
update,
getLazyMenuList,
- getMenu,
+ getMenu
} from "@/api/system/menu";
import {
addApiScope,
removeApiScope,
updateApiScope,
getListApiScope,
- getMenuApiScope,
+ getMenuApiScope
} from "@/api/system/scope";
import { mapGetters } from "vuex";
import iconList from "@/config/iconList";
@@ -116,7 +120,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
drawerVisible: false,
direction: "rtl",
@@ -151,9 +155,9 @@
{
required: true,
message: "请输入菜单名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "路由地址",
@@ -162,9 +166,9 @@
{
required: true,
message: "请输入路由地址",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "上级菜单",
@@ -173,15 +177,15 @@
dicUrl: "/api/blade-system/menu/tree",
hide: true,
props: {
- label: "title",
+ label: "title"
},
rules: [
{
required: false,
message: "请选择上级菜单",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "菜单图标",
@@ -194,9 +198,9 @@
{
required: true,
message: "请输入菜单图标",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "菜单编号",
@@ -206,9 +210,9 @@
{
required: true,
message: "请输入菜单编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单类型",
@@ -217,21 +221,21 @@
dicData: [
{
label: "菜单",
- value: 1,
+ value: 1
},
{
label: "按钮",
- value: 2,
- },
+ value: 2
+ }
],
hide: true,
rules: [
{
required: true,
message: "请选择菜单类型",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单别名",
@@ -240,9 +244,9 @@
{
required: true,
message: "请输入菜单别名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "按钮功能",
@@ -251,25 +255,25 @@
dicData: [
{
label: "工具栏",
- value: 0,
+ value: 0
},
{
label: "操作栏",
- value: 1,
+ value: 1
},
{
label: "工具操作栏",
- value: 2,
- },
+ value: 2
+ }
],
hide: true,
rules: [
{
required: true,
message: "请选择按钮功能",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单排序",
@@ -280,9 +284,9 @@
{
required: true,
message: "请输入菜单排序",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "新窗口",
@@ -291,14 +295,14 @@
dicData: [
{
label: "否",
- value: 0,
+ value: 0
},
{
label: "是",
- value: 1,
- },
+ value: 1
+ }
],
- hide: true,
+ hide: true
},
{
label: "菜单备注",
@@ -306,9 +310,9 @@
type: "textarea",
span: 24,
minRows: 6,
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
data: [],
formScope: {},
@@ -316,7 +320,7 @@
pageScope: {
pageSize: 10,
currentPage: 1,
- total: 0,
+ total: 0
},
optionScope: {
tip: false,
@@ -339,9 +343,9 @@
{
required: true,
message: "请输入数据权限名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "权限编号",
@@ -352,9 +356,9 @@
{
required: true,
message: "请输入数据权限编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "权限路径",
@@ -364,9 +368,9 @@
{
required: true,
message: "请输入数据权限编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "接口类型",
@@ -374,7 +378,7 @@
dicUrl: "/api/blade-system/dict/dictionary?code=api_scope_type",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
dataType: "number",
slot: true,
@@ -384,19 +388,19 @@
{
required: true,
message: "请输入通知类型",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "备注",
prop: "remark",
span: 24,
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
- dataScope: [],
+ dataScope: []
};
},
@@ -407,23 +411,26 @@
addBtn: this.vaildData(this.permission.menu_add, false),
viewBtn: this.vaildData(this.permission.menu_view, false),
delBtn: this.vaildData(this.permission.menu_delete, false),
- editBtn: this.vaildData(this.permission.menu_edit, false),
+ editBtn: this.vaildData(this.permission.menu_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
scopeIds() {
let ids = [];
- this.selectionListScope.forEach((ele) => {
+ this.selectionListScope.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
// 菜单管理模块
@@ -433,11 +440,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -449,11 +456,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -463,7 +470,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -472,7 +479,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -503,7 +510,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -512,14 +519,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getMenu(this.form.id).then((res) => {
+ getMenu(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -537,16 +544,17 @@
onLoad(page, params = {}) {
this.loading = true;
getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(
- (res) => {
+ res => {
this.data = res.data.data;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
}
);
},
treeLoad(tree, treeNode, resolve) {
const parentId = tree.id;
- getLazyMenuList(parentId).then((res) => {
+ getLazyMenuList(parentId).then(res => {
resolve(res.data.data);
});
},
@@ -563,18 +571,18 @@
rowSaveScope(row, done, loading) {
row = {
...row,
- menuId: this.scopeMenuId,
+ menuId: this.scopeMenuId
};
addApiScope(row).then(
() => {
this.onLoadScope(this.pageScope);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -583,18 +591,18 @@
rowUpdateScope(row, index, done, loading) {
row = {
...row,
- menuId: this.scopeMenuId,
+ menuId: this.scopeMenuId
};
updateApiScope(row).then(
() => {
this.onLoadScope(this.pageScope);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -604,7 +612,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return removeApiScope(row.id);
@@ -613,7 +621,7 @@
this.onLoadScope(this.pageScope);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -625,7 +633,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return removeApiScope(this.scopeIds);
@@ -634,14 +642,14 @@
this.onLoadScope(this.pageScope);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudScope.toggleSelection();
});
},
beforeOpenScope(done, type) {
if (["edit", "view"].includes(type)) {
- getMenuApiScope(this.formScope.id).then((res) => {
+ getMenuApiScope(this.formScope.id).then(res => {
this.formScope = res.data.data;
});
}
@@ -667,20 +675,21 @@
this.scopeLoading = true;
const values = {
...params,
- menuId: this.scopeMenuId,
+ menuId: this.scopeMenuId
};
getListApiScope(
page.currentPage,
page.pageSize,
Object.assign(values, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.pageScope.total = data.total;
this.dataScope = data.records;
this.selectionListScope = [];
+ this.$store.commit("setWindowSizeHeightAdd");
this.scopeLoading = false;
});
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/authority/datascope.vue b/src/views/authority/datascope.vue
index 8e60f81..ea34f7d 100644
--- a/src/views/authority/datascope.vue
+++ b/src/views/authority/datascope.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -92,14 +96,14 @@
remove,
update,
getLazyMenuList,
- getMenu,
+ getMenu
} from "@/api/system/menu";
import {
addDataScope,
removeDataScope,
updateDataScope,
getListDataScope,
- getMenuDataScope,
+ getMenuDataScope
} from "@/api/system/scope";
import { mapGetters } from "vuex";
import iconList from "@/config/iconList";
@@ -117,7 +121,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
drawerVisible: false,
direction: "rtl",
@@ -154,9 +158,9 @@
{
required: true,
message: "请输入菜单名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "路由地址",
@@ -165,9 +169,9 @@
{
required: true,
message: "请输入路由地址",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "上级菜单",
@@ -176,15 +180,15 @@
dicUrl: "/api/blade-system/menu/tree",
hide: true,
props: {
- label: "title",
+ label: "title"
},
rules: [
{
required: false,
message: "请选择上级菜单",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "菜单图标",
@@ -197,9 +201,9 @@
{
required: true,
message: "请输入菜单图标",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "菜单编号",
@@ -209,9 +213,9 @@
{
required: true,
message: "请输入菜单编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单类型",
@@ -220,21 +224,21 @@
dicData: [
{
label: "菜单",
- value: 1,
+ value: 1
},
{
label: "按钮",
- value: 2,
- },
+ value: 2
+ }
],
hide: true,
rules: [
{
required: true,
message: "请选择菜单类型",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单别名",
@@ -243,9 +247,9 @@
{
required: true,
message: "请输入菜单别名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "按钮功能",
@@ -254,25 +258,25 @@
dicData: [
{
label: "工具栏",
- value: 0,
+ value: 0
},
{
label: "操作栏",
- value: 1,
+ value: 1
},
{
label: "工具操作栏",
- value: 2,
- },
+ value: 2
+ }
],
hide: true,
rules: [
{
required: true,
message: "请选择按钮功能",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单排序",
@@ -283,9 +287,9 @@
{
required: true,
message: "请输入菜单排序",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "新窗口",
@@ -294,14 +298,14 @@
dicData: [
{
label: "否",
- value: 0,
+ value: 0
},
{
label: "是",
- value: 1,
- },
+ value: 1
+ }
],
- hide: true,
+ hide: true
},
{
label: "菜单备注",
@@ -309,9 +313,9 @@
type: "textarea",
span: 24,
minRows: 6,
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
data: [],
formScope: {},
@@ -319,7 +323,7 @@
pageScope: {
pageSize: 10,
currentPage: 1,
- total: 0,
+ total: 0
},
optionScope: {
tip: false,
@@ -343,9 +347,9 @@
{
required: true,
message: "请输入数据权限名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "权限编号",
@@ -356,9 +360,9 @@
{
required: true,
message: "请输入数据权限编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "权限字段",
@@ -368,9 +372,9 @@
{
required: true,
message: "请输入数据权限编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "规则类型",
@@ -378,7 +382,7 @@
dicUrl: "/api/blade-system/dict/dictionary?code=data_scope_type",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
dataType: "number",
slot: true,
@@ -388,9 +392,9 @@
{
required: true,
message: "请输入通知类型",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "可见字段",
@@ -402,9 +406,9 @@
{
required: true,
message: "请输入数据权限可见的字段",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "权限类名",
@@ -415,9 +419,9 @@
{
required: true,
message: "请输入MybatisMapper对应方法的完整类名路径",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "规则值",
@@ -426,23 +430,23 @@
minRows: 5,
type: "textarea",
display: true,
- hide: true,
+ hide: true
},
{
label: "备注",
prop: "remark",
span: 24,
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
- dataScope: [],
+ dataScope: []
};
},
watch: {
"formScope.scopeType"() {
this.initScope();
- },
+ }
},
computed: {
...mapGetters(["permission"]),
@@ -451,23 +455,26 @@
addBtn: this.vaildData(this.permission.menu_add, false),
viewBtn: this.vaildData(this.permission.menu_view, false),
delBtn: this.vaildData(this.permission.menu_delete, false),
- editBtn: this.vaildData(this.permission.menu_edit, false),
+ editBtn: this.vaildData(this.permission.menu_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
scopeIds() {
let ids = [];
- this.selectionListScope.forEach((ele) => {
+ this.selectionListScope.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
initScope() {
@@ -491,7 +498,7 @@
column = "";
name = "自定义";
}
- this.$refs.crudScope.option.column.filter((item) => {
+ this.$refs.crudScope.option.column.filter(item => {
if (watchMode) {
if (item.prop === "scopeName") {
this.formScope.scopeName = `${this.scopeMenuName} [${name}]`;
@@ -515,11 +522,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -531,11 +538,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -545,7 +552,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -554,7 +561,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -585,7 +592,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -594,14 +601,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getMenu(this.form.id).then((res) => {
+ getMenu(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -619,16 +626,17 @@
onLoad(page, params = {}) {
this.loading = true;
getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(
- (res) => {
+ res => {
this.data = res.data.data;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
}
);
},
treeLoad(tree, treeNode, resolve) {
const parentId = tree.id;
- getLazyMenuList(parentId).then((res) => {
+ getLazyMenuList(parentId).then(res => {
resolve(res.data.data);
});
},
@@ -646,18 +654,18 @@
rowSaveScope(row, done, loading) {
row = {
...row,
- menuId: this.scopeMenuId,
+ menuId: this.scopeMenuId
};
addDataScope(row).then(
() => {
this.onLoadScope(this.pageScope);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -666,18 +674,18 @@
rowUpdateScope(row, index, done, loading) {
row = {
...row,
- menuId: this.scopeMenuId,
+ menuId: this.scopeMenuId
};
updateDataScope(row).then(
() => {
this.onLoadScope(this.pageScope);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -687,7 +695,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return removeDataScope(row.id);
@@ -696,7 +704,7 @@
this.onLoadScope(this.pageScope);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -708,7 +716,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return removeDataScope(this.scopeIds);
@@ -717,7 +725,7 @@
this.onLoadScope(this.pageScope);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudScope.toggleSelection();
});
@@ -729,7 +737,7 @@
}
if (["edit", "view"].includes(type)) {
this.watchMode = false;
- getMenuDataScope(this.formScope.id).then((res) => {
+ getMenuDataScope(this.formScope.id).then(res => {
this.formScope = res.data.data;
});
}
@@ -755,21 +763,21 @@
this.scopeLoading = true;
const values = {
...params,
- menuId: this.scopeMenuId,
+ menuId: this.scopeMenuId
};
getListDataScope(
page.currentPage,
page.pageSize,
Object.assign(values, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.pageScope.total = data.total;
this.dataScope = data.records;
this.selectionListScope = [];
+ this.$store.commit("setWindowSizeHeightAdd");
this.scopeLoading = false;
});
- },
- },
+ }
+ }
};
</script>
-
diff --git a/src/views/authority/role.vue b/src/views/authority/role.vue
index b1d2282..5c75487 100644
--- a/src/views/authority/role.vue
+++ b/src/views/authority/role.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'hasButThree',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -103,7 +105,7 @@
grant,
grantTree,
remove,
- update,
+ update
} from "@/api/system/role";
import { mapGetters } from "vuex";
import website from "@/config/website";
@@ -115,7 +117,7 @@
box: false,
props: {
label: "title",
- value: "key",
+ value: "key"
},
menuGrantList: [],
dataScopeGrantList: [],
@@ -131,7 +133,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
option: {
tip: false,
@@ -156,9 +158,9 @@
{
required: true,
message: "请输入角色名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
// {
// label: "所属单位",
@@ -192,9 +194,9 @@
{
required: true,
message: "请输入角色别名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "上级角色",
@@ -204,15 +206,15 @@
hide: true,
span: 24,
props: {
- label: "title",
+ label: "title"
},
rules: [
{
required: false,
message: "请选择上级角色",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "角色排序",
@@ -223,13 +225,13 @@
{
required: true,
message: "请输入角色排序",
- trigger: "blur",
- },
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -239,27 +241,30 @@
addBtn: this.vaildData(this.permission.role_add, false),
viewBtn: this.vaildData(this.permission.role_view, false),
delBtn: this.vaildData(this.permission.role_delete, false),
- editBtn: this.vaildData(this.permission.role_edit, false),
+ editBtn: this.vaildData(this.permission.role_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
idsArray() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids;
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
initData(roleId) {
- getRoleTreeById(roleId).then((res) => {
+ getRoleTreeById(roleId).then(res => {
const column = this.findObject(this.option.column, "parentId");
column.dicData = res.data.data;
});
@@ -272,7 +277,7 @@
this.box = false;
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.onLoad(this.page);
});
@@ -283,11 +288,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -299,11 +304,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -313,7 +318,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -322,7 +327,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -358,11 +363,11 @@
this.menuTreeObj = [];
this.dataScopeTreeObj = [];
this.apiScopeTreeObj = [];
- grantTree().then((res) => {
+ grantTree().then(res => {
this.menuGrantList = res.data.data.menu;
this.dataScopeGrantList = res.data.data.dataScope;
this.apiScopeGrantList = res.data.data.apiScope;
- getRole(this.ids).then((res) => {
+ getRole(this.ids).then(res => {
this.menuTreeObj = res.data.data.menu;
this.dataScopeTreeObj = res.data.data.dataScope;
this.apiScopeTreeObj = res.data.data.apiScope;
@@ -378,7 +383,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -387,7 +392,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
@@ -407,12 +412,13 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
this.data = res.data.data;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/companyApply/index.vue b/src/views/companyApply/index.vue
index 6c0cf6b..7235e73 100644
--- a/src/views/companyApply/index.vue
+++ b/src/views/companyApply/index.vue
@@ -1,130 +1,114 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-05 16:31:54
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-23 14:16:07
- * menu-name 报名考试
- */
+/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
+@Last Modified time: 2021-11-23 14:16:07 * menu-name 报名考试 */
<template>
- <el-row class="morpheus-box-apply-exam">
- <el-col
- :span="24"
- :class="[
- 'hasButOne',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ v-model="obj"
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ :permission="permissionList"
+ ref="questionBankCrud"
+ :page.sync="questionBankPage"
+ @on-load="questionBankOnLoad"
+ @selection-change="questionBankSelectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-save="questionBankRowSave"
+ @row-del="questionBankRowDel"
>
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
- >
- <avue-crud
- v-model="obj"
- class="company-box"
- :option="questionBankOption"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- :permission="permissionList"
- ref="questionBankCrud"
- :page.sync="questionBankPage"
- @on-load="questionBankOnLoad"
- @selection-change="questionBankSelectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-save="questionBankRowSave"
- @row-del="questionBankRowDel"
- >
- <!-- 自定义按钮 -->
- <template slot="menuLeft">
- <el-button
- type="primary"
- size="small"
- plain
- v-if="permission.company_batch_add"
- icon="el-icon-folder-checked"
- @click="handleBatchApply"
- >批量报名
- </el-button>
- </template>
+ <!-- 自定义按钮 -->
+ <template slot="menuLeft">
+ <el-button
+ type="primary"
+ size="small"
+ plain
+ v-if="permission.company_batch_add"
+ icon="el-icon-folder-checked"
+ @click="handleBatchApply"
+ >批量报名
+ </el-button>
+ </template>
- <template slot-scope="{ type, row }" slot="menu">
- <el-button
- :type="type"
- size="small"
- icon="el-icon-refresh-left"
- v-if="row.isApply == 1 && permission.company_cancel"
- @click="handleCancel(row)"
- >取消报名
- </el-button>
- <el-button
- :type="type"
- size="small"
- icon="el-icon-folder-checked"
- v-if="row.isApply != 1 && permission.company_add"
- :disabled="row.examinationType == '1'"
- @click="questionBankRowSave(row)"
- >报名
- </el-button>
- <el-button
- :type="type"
- style="display: none"
- size="small"
- icon="el-icon-receiving"
- :disabled="row.isApply == 2"
- @click="handlePrint(row)"
- >准考证打印
- </el-button>
- </template>
- </avue-crud>
+ <template slot-scope="{ type, row }" slot="menu">
+ <el-button
+ :type="type"
+ size="small"
+ icon="el-icon-refresh-left"
+ v-if="row.isApply == 1 && permission.company_cancel"
+ @click="handleCancel(row)"
+ >取消报名
+ </el-button>
+ <el-button
+ :type="type"
+ size="small"
+ icon="el-icon-folder-checked"
+ v-if="row.isApply != 1 && permission.company_add"
+ :disabled="row.examinationType == '1'"
+ @click="questionBankRowSave(row)"
+ >报名
+ </el-button>
+ <el-button
+ :type="type"
+ style="display: none"
+ size="small"
+ icon="el-icon-receiving"
+ :disabled="row.isApply == 2"
+ @click="handlePrint(row)"
+ >准考证打印
+ </el-button>
+ </template>
+ </avue-crud>
- <el-dialog
- title="考试资格审核"
- :visible.sync="dialogFormVisible"
- modal-append-to-body="false"
- append-to-body="true"
- :close-on-click-model="true"
- >
- <avue-form
- ref="formAudit"
- v-model="Audit"
- :option="optionAudit"
- @reset-change="emptytChange"
- @submit="submit"
- ></avue-form>
- </el-dialog>
+ <el-dialog
+ title="考试资格审核"
+ :visible.sync="dialogFormVisible"
+ modal-append-to-body="false"
+ append-to-body="true"
+ :close-on-click-model="true"
+ >
+ <avue-form
+ ref="formAudit"
+ v-model="Audit"
+ :option="optionAudit"
+ @reset-change="emptytChange"
+ @submit="submit"
+ ></avue-form>
+ </el-dialog>
- <el-dialog
- title="报名"
- append-to-body
- :visible.sync="dialogBatchFormVisible"
- width="1000px"
- @close="closeDialog"
- >
- <avue-form
- ref="formBatchApply"
- v-model="BatchApply"
- :option="optionBatchApply"
- @reset-change="emptytChange"
- @submit="submitBatchApply"
- ></avue-form>
- </el-dialog>
- </div>
- </el-card>
- </el-col>
- </el-row>
+ <el-dialog
+ title="报名"
+ append-to-body
+ :visible.sync="dialogBatchFormVisible"
+ width="1000px"
+ @close="closeDialog"
+ >
+ <avue-form
+ ref="formBatchApply"
+ v-model="BatchApply"
+ :option="optionBatchApply"
+ @reset-change="emptytChange"
+ @submit="submitBatchApply"
+ ></avue-form>
+ </el-dialog>
+ </basic-container>
</template>
<script>
import {
addApply,
cancelApplyNotApplyId,
- remove,
+ remove
} from "@/api/examapi/applyexam";
import { getListApply, addBatchApply } from "@/api/securityGuard/securityGuard";
import { mapState } from "vuex";
@@ -133,17 +117,17 @@
applyStatus: [
{
label: "已报名",
- value: 1,
+ value: 1
},
{
label: "已取消",
- value: 2,
+ value: 2
},
{
label: "考试结束",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
};
export default {
@@ -170,6 +154,7 @@
menuWidth: 230,
dialogClickModal: false,
...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.searchOpen,
column: [
{
label: "审核状态",
@@ -185,27 +170,27 @@
{
required: true,
message: "请选择审核类型",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
dicData: [
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
span: 24,
type: "textarea",
- prop: "auditDetail",
- },
- ],
+ prop: "auditDetail"
+ }
+ ]
},
optionBatchApply: {
height: "auto",
@@ -233,7 +218,7 @@
// dicUrl: "/api/blade-user/page-security-unit?deptId="+this.deptId,
props: {
label: "name",
- value: "id",
+ value: "id"
},
//不包含父节点值
leafOnly: true,
@@ -243,12 +228,12 @@
{
required: true,
message: "请输入姓名",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
questionBankOption: {
// 操作栏多余按钮去除
@@ -285,7 +270,7 @@
search: true,
searchSpan: 4,
searchLabelWidth: 50,
- display: false,
+ display: false
},
{
label: "性别",
@@ -294,38 +279,38 @@
dicData: [
{
label: "男",
- value: 1,
+ value: 1
},
{
label: "女",
- value: 2,
+ value: 2
},
{
label: "未知",
- value: 3,
+ value: 3
},
{
label: " ",
- value: -1,
- },
+ value: -1
+ }
],
- display: false,
+ display: false
},
{
label: "籍贯",
prop: "nativeplace",
- display: false,
+ display: false
},
{
label: "联系电话",
prop: "phone",
- display: false,
+ display: false
},
{
label: "入职时间",
prop: "rtime",
- display: false,
+ display: false
},
{
label: "保安公司名称",
@@ -337,13 +322,13 @@
"/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
label: "title",
- value: "id",
+ value: "id"
},
slot: true,
searchSpan: 4,
display: false,
search: false,
- width: 260,
+ width: 260
},
{
label: "是否持证",
@@ -353,16 +338,16 @@
dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
type: "select",
rules: [
{
required: true,
message: "请选择",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "在职状态",
@@ -371,7 +356,7 @@
dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
dataType: "number",
display: false,
@@ -381,9 +366,9 @@
{
required: true,
message: "请选择在职状态",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "是否报名",
@@ -392,20 +377,20 @@
dicData: [
{
label: "是",
- value: 1,
+ value: 1
},
{
label: "已取消",
- value: 2,
+ value: 2
},
{
label: "考试结束",
- value: 3,
+ value: 3
},
{
label: "否",
- value: 4,
- },
+ value: 4
+ }
],
dataType: "number",
display: false,
@@ -415,11 +400,11 @@
{
required: true,
message: "请选择在职状态",
- trigger: "blur",
- },
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
},
questionBankSearch: {},
questionBankLoading: true,
@@ -428,10 +413,10 @@
pageSize: 10,
currentPage: 1,
total: 16,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
questionBankQuery: {},
- questionBankSelectionList: [],
+ questionBankSelectionList: []
};
},
created() {
@@ -449,10 +434,12 @@
this.optionBatchApply.column[0].dicUrl =
"/api/blade-user/security-apply-tree?deptId=" + this.userInfo.dept_id;
},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
computed: {
...mapState({
- userInfo: (state) => state.user.userInfo,
+ userInfo: state => state.user.userInfo
}),
...mapGetters(["userInfo", "permission"]),
permissionList() {
@@ -460,16 +447,16 @@
addBtn: this.vaildData(null, false),
viewBtn: this.vaildData(null, false),
delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false)
};
},
ids() {
let ids = [];
- this.questionBankSelectionList.forEach((ele) => {
+ this.questionBankSelectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
methods: {
//准考证查看
@@ -478,7 +465,7 @@
obj["name"] = "准考证信息";
this.$router.push({
path: `/applyexam/papers`,
- query: obj,
+ query: obj
});
},
questionBankOnLoad(page, params = {}) {
@@ -489,11 +476,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.questionBankQuery)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.questionBankPage.total = data.total;
this.questionBankData = data.records;
this.questionBankLoading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.questionBankSelectionClear();
});
},
@@ -525,29 +513,29 @@
questionBankRowSave(row, done, loading) {
// debugger;
addApply({
- userId: row.id,
+ userId: row.id
}).then(
- (res) => {
+ res => {
this.questionBankOnLoad(this.questionBankPage);
if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "已报名，不能重复报名",
+ message: "已报名，不能重复报名"
});
} else if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "报名失败",
+ message: "报名失败"
});
} else {
this.$message({
type: "success",
- message: "报名成功",
+ message: "报名成功"
});
}
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -558,7 +546,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -567,7 +555,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -577,7 +565,7 @@
this.$confirm("确定取消报名?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
row.applyStatus = 4;
@@ -588,7 +576,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -600,32 +588,32 @@
this.$confirm("确定全部人员报名?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
var userIds = "";
addBatchApply(userIds, this.userInfo.dept_id).then(
- (res) => {
+ res => {
this.questionBankOnLoad(this.questionBankPage);
if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "已报名，不能重复报名",
+ message: "已报名，不能重复报名"
});
} else if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "报名失败",
+ message: "报名失败"
});
} else {
this.$message({
type: "success",
- message: "报名成功",
+ message: "报名成功"
});
this.$refs.formBatchApply.resetFields();
this.dialogBatchFormVisible = false;
}
},
- (error) => {
+ error => {
window.console.log(error);
}
);
@@ -634,31 +622,31 @@
this.$confirm("确定选择人员报名?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
addBatchApply(this.ids, this.userInfo.dept_id).then(
- (res) => {
+ res => {
this.questionBankOnLoad(this.questionBankPage);
if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "已报名，不能重复报名",
+ message: "已报名，不能重复报名"
});
} else if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "报名失败",
+ message: "报名失败"
});
} else {
this.$message({
type: "success",
- message: "报名成功",
+ message: "报名成功"
});
this.$refs.formBatchApply.resetFields();
this.dialogBatchFormVisible = false;
}
},
- (error) => {
+ error => {
window.console.log(error);
}
);
@@ -711,7 +699,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -720,7 +708,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.questionBankCrud.toggleSelection();
});
@@ -728,10 +716,9 @@
handleAudit(row) {
this.dialogFormVisible = true;
this.Audit = row;
- },
- },
+ }
+ }
};
</script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index 3c26640..ddcf661 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'desk1',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -83,7 +85,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -118,9 +120,9 @@
{
required: true,
message: "请输入通知标题",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "通知类型",
@@ -128,7 +130,7 @@
dicUrl: "/api/blade-system/dict/dictionary?code=notice",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
dataType: "number",
slot: true,
@@ -142,9 +144,9 @@
{
required: true,
message: "请输入通知类型",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "发布单位",
@@ -153,7 +155,7 @@
dicUrl: "/api/blade-system/dept/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
addDisplay: false,
editDisplay: false,
@@ -161,9 +163,9 @@
{
required: true,
message: "所属组织机构",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "通知时间",
@@ -182,9 +184,9 @@
{
required: true,
message: "请输入通知时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "通知日期",
@@ -196,9 +198,9 @@
{
required: true,
message: "请输入通知日期",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "通知内容",
@@ -208,16 +210,16 @@
action: "/api/blade-resource/oss/endpoint/put-file",
props: {
res: "data",
- url: "link",
- },
+ url: "link"
+ }
},
hide: true,
minRows: 6,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -227,28 +229,29 @@
addBtn: this.vaildData(this.permission.notice_add, false),
viewBtn: this.vaildData(this.permission.notice_view, false),
delBtn: this.vaildData(this.permission.notice_delete, false),
- editBtn: this.vaildData(this.permission.notice_edit, false),
+ editBtn: this.vaildData(this.permission.notice_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
- }),
+ userInfo: state => state.user.userInfo
+ })
},
mounted() {
this.getDeptInfo(this.userInfo.dept_id);
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
//获取当前用户部门信息
getDeptInfo(deptId) {
var that = this;
- getDept(deptId).then((res) => {
+ getDept(deptId).then(res => {
var deptCategory = res.data.data.deptCategory;
deptCategory == 1
? (that.deptCategory = true)
@@ -261,8 +264,8 @@
path: `/resource/uploadNotice`,
query: {
deptId: row.deptId,
- noticeId: row.id,
- },
+ noticeId: row.id
+ }
});
},
rowSave(row, done, loading) {
@@ -278,11 +281,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -300,11 +303,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -314,7 +317,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -323,7 +326,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -352,7 +355,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -361,14 +364,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getNotice(this.form.id).then((res) => {
+ getNotice(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -390,7 +393,7 @@
//获取当前用户部门信息，判断是否为公安，如果是公安，则只能查看公告信息
var that = this;
- getDept(this.deptId).then((res) => {
+ getDept(this.deptId).then(res => {
var deptCategory = res.data.data.deptCategory;
deptCategory == 1
? (that.deptCategory = true)
@@ -402,37 +405,37 @@
this.userInfo.role_name == "保安" ||
this.userInfo.role_name == "装备管理员"
) {
- params['deptId'] = this.userInfo.dept_id;
+ params["deptId"] = this.userInfo.dept_id;
}
const { releaseTimeRange } = this.query;
params["jurisdiction"] = this.jurisdiction;
params["type"] = 1;
let values = {
- ...params,
+ ...params
};
if (releaseTimeRange) {
values = {
...params,
startTime: releaseTimeRange[0],
endTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
values.releaseTimeRange = null;
}
this.loading = true;
- getListPage(page.currentPage, page.pageSize, values).then((res) => {
+ getListPage(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/desk/notification.vue b/src/views/desk/notification.vue
index e5cd358..4797569 100644
--- a/src/views/desk/notification.vue
+++ b/src/views/desk/notification.vue
@@ -2,7 +2,8 @@
<basic-container
:class="[
'desk1',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<!--
@@ -25,6 +26,7 @@
...this.$store.state.control.changePageSize,
-->
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -102,7 +104,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -137,9 +139,9 @@
{
required: true,
message: "请输入通知标题",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "封面",
@@ -151,10 +153,10 @@
action: "/api/blade-resource/oss/endpoint/put-file",
propsHttp: {
res: "data",
- url: "link",
+ url: "link"
},
// hide: true,
- span: 24,
+ span: 24
},
// {
// label: "类型",
@@ -187,7 +189,7 @@
dicUrl: "/api/blade-system/dept/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
addDisplay: false,
editDisplay: false,
@@ -195,9 +197,9 @@
{
required: true,
message: "所属组织机构",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "发布时间",
@@ -215,9 +217,9 @@
{
required: true,
message: "请输入发布时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "发布时间",
@@ -229,9 +231,9 @@
{
required: true,
message: "请输入发布时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "发布内容",
@@ -241,16 +243,16 @@
action: "/api/blade-resource/oss/endpoint/put-file",
props: {
res: "data",
- url: "link",
- },
+ url: "link"
+ }
},
hide: true,
minRows: 4,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -260,28 +262,29 @@
addBtn: this.vaildData(this.permission.notice_add, false),
viewBtn: this.vaildData(this.permission.notice_view, false),
delBtn: this.vaildData(this.permission.notice_delete, false),
- editBtn: this.vaildData(this.permission.notice_edit, false),
+ editBtn: this.vaildData(this.permission.notice_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
- }),
+ userInfo: state => state.user.userInfo
+ })
},
mounted() {
this.getDeptInfo(this.userInfo.dept_id);
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
//获取当前用户部门信息
getDeptInfo(deptId) {
var that = this;
- getDept(deptId).then((res) => {
+ getDept(deptId).then(res => {
var deptCategory = res.data.data.deptCategory;
deptCategory == 1
? (that.deptCategory = true)
@@ -294,8 +297,8 @@
path: `/resource/uploadNotification`,
query: {
deptId: row.deptId,
- noticeId: row.id,
- },
+ noticeId: row.id
+ }
});
},
rowSave(row, done, loading) {
@@ -306,11 +309,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -323,11 +326,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -337,7 +340,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -346,7 +349,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -375,7 +378,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -384,14 +387,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getNotice(this.form.id).then((res) => {
+ getNotice(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -413,7 +416,7 @@
//获取当前用户部门信息，判断是否为公安，如果是公安，则只能查看公告信息
var that = this;
- getDept(this.deptId).then((res) => {
+ getDept(this.deptId).then(res => {
var deptCategory = res.data.data.deptCategory;
deptCategory == 1
? (that.deptCategory = true)
@@ -425,36 +428,36 @@
this.userInfo.role_name == "保安" ||
this.userInfo.role_name == "装备管理员"
) {
- params['deptId'] = this.userInfo.dept_id;
+ params["deptId"] = this.userInfo.dept_id;
}
const { releaseTimeRange } = this.query;
params["jurisdiction"] = this.jurisdiction;
params["type"] = 3;
let values = {
- ...params,
+ ...params
};
if (releaseTimeRange) {
values = {
...params,
startTime: releaseTimeRange[0],
endTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
values.releaseTimeRange = null;
}
this.loading = true;
- getListPage(page.currentPage, page.pageSize, values).then((res) => {
+ getListPage(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/desk/policyRelease.vue b/src/views/desk/policyRelease.vue
index faa2725..b075f94 100644
--- a/src/views/desk/policyRelease.vue
+++ b/src/views/desk/policyRelease.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'desk1',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -83,7 +85,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -118,9 +120,9 @@
{
required: true,
message: "请输入通知标题",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "封面",
@@ -132,10 +134,10 @@
action: "/api/blade-resource/oss/endpoint/put-file",
propsHttp: {
res: "data",
- url: "link",
+ url: "link"
},
// hide: true,
- span: 24,
+ span: 24
},
// {
// label: "类型",
@@ -168,7 +170,7 @@
dicUrl: "/api/blade-system/dept/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
addDisplay: false,
editDisplay: false,
@@ -176,9 +178,9 @@
{
required: true,
message: "所属组织机构",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "发布时间",
@@ -196,9 +198,9 @@
{
required: true,
message: "请输入发布时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "发布时间",
@@ -210,9 +212,9 @@
{
required: true,
message: "请输入发布时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "发布内容",
@@ -222,16 +224,16 @@
action: "/api/blade-resource/oss/endpoint/put-file",
props: {
res: "data",
- url: "link",
- },
+ url: "link"
+ }
},
hide: true,
minRows: 4,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -241,28 +243,29 @@
addBtn: this.vaildData(this.permission.notice_add, false),
viewBtn: this.vaildData(this.permission.notice_view, false),
delBtn: this.vaildData(this.permission.notice_delete, false),
- editBtn: this.vaildData(this.permission.notice_edit, false),
+ editBtn: this.vaildData(this.permission.notice_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
- }),
+ userInfo: state => state.user.userInfo
+ })
},
mounted() {
this.getDeptInfo(this.userInfo.dept_id);
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
//获取当前用户部门信息
getDeptInfo(deptId) {
var that = this;
- getDept(deptId).then((res) => {
+ getDept(deptId).then(res => {
var deptCategory = res.data.data.deptCategory;
deptCategory == 1
? (that.deptCategory = true)
@@ -275,8 +278,8 @@
path: `/resource/uploadPolicyRelease`,
query: {
deptId: row.deptId,
- noticeId: row.id,
- },
+ noticeId: row.id
+ }
});
},
rowSave(row, done, loading) {
@@ -287,11 +290,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -304,11 +307,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -318,7 +321,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -327,7 +330,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -356,7 +359,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -365,14 +368,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getNotice(this.form.id).then((res) => {
+ getNotice(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -394,7 +397,7 @@
//获取当前用户部门信息，判断是否为公安，如果是公安，则只能查看公告信息
var that = this;
- getDept(this.deptId).then((res) => {
+ getDept(this.deptId).then(res => {
var deptCategory = res.data.data.deptCategory;
deptCategory == 1
? (that.deptCategory = true)
@@ -406,36 +409,36 @@
this.userInfo.role_name == "保安" ||
this.userInfo.role_name == "装备管理员"
) {
- params['deptId'] = this.userInfo.dept_id;
+ params["deptId"] = this.userInfo.dept_id;
}
const { releaseTimeRange } = this.query;
params["jurisdiction"] = this.jurisdiction;
params["type"] = 2;
let values = {
- ...params,
+ ...params
};
if (releaseTimeRange) {
values = {
...params,
startTime: releaseTimeRange[0],
endTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
values.releaseTimeRange = null;
}
this.loading = true;
- getListPage(page.currentPage, page.pageSize, values).then((res) => {
+ getListPage(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/dispatch/dispatch.vue b/src/views/dispatch/dispatch.vue
index 25e3d52..353c77b 100644
--- a/src/views/dispatch/dispatch.vue
+++ b/src/views/dispatch/dispatch.vue
@@ -1,74 +1,75 @@
<template>
- <basic-container>
- <div
- :class="[
- 'dispatch',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
- >
- <!-- <avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs>
+ <basic-container
+ :class="[
+ 'dispatch',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <!-- <avue-tabs :option="optionTABS" @change="handleChangeTABS"></avue-tabs>
<span v-if="typeTABS.prop === 'tab1'"> -->
- <avue-crud
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec"
- @on-load="onLoad"
- :table-loading="loading"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
- @row-click="rowClick"
- >
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete"
- >删 除
- </el-button>
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec"
+ @on-load="onLoad"
+ :table-loading="loading"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
+ @row-click="rowClick"
+ >
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport"
- >批量导入
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport"
+ >批量导入
+ </el-button>
+ </template>
+
+ <template slot-scope="{ row }" slot="jurisdiction">
+ {{ row.jurisdiction == -1 ? "" : row.jurisdiction }}
+ </template>
+ </avue-crud>
+
+ <el-dialog
+ title="派遣单位导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
+ >
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
</el-button>
</template>
+ </avue-form>
+ </el-dialog>
- <template slot-scope="{ row }" slot="jurisdiction">
- {{ row.jurisdiction == -1 ? "" : row.jurisdiction }}
- </template>
- </avue-crud>
-
- <el-dialog
- title="派遣单位导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px"
- >
- <avue-form
- :option="excelOption"
- v-model="excelForm"
- :upload-after="uploadAfter"
- >
- <template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
- 点击下载<i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog>
-
- <!-- </span>
+ <!-- </span>
<span v-else-if="typeTABS.prop === 'tab2'">
<avue-crud
:option="option1"
@@ -97,26 +98,19 @@
</template>
</avue-crud>
</span> -->
- <!-- <span v-else-if="typeTABS.prop === 'tab3'">选项卡内容3</span> -->
- </div>
+ <!-- <span v-else-if="typeTABS.prop === 'tab3'">选项卡内容3</span> -->
</basic-container>
</template>
<script>
-import {
- getdata,
- adddata,
- update,
- remove,
-} from "@/api/dispatch/dispatch";
+import { getdata, adddata, update, remove } from "@/api/dispatch/dispatch";
import { mapGetters } from "vuex";
import { mapState } from "vuex";
import { getToken } from "@/util/auth";
export default {
data() {
var phones = (rule, value, callback) => {
- window.yanzhengphons =
- /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/;
+ window.yanzhengphons = /^1([358][0-9]|4[579]|66|7[0135678]|9[89])[0-9]{8}$/;
if (!yanzhengphons.test(value)) {
callback(new Error("请输入正确电话"));
} else {
@@ -131,19 +125,19 @@
{
icon: "el-icon-info",
label: "派遣服务公司登记",
- prop: "tab1",
+ prop: "tab1"
},
{
icon: "el-icon-info",
label: "派遣记录",
- prop: "tab2",
- },
+ prop: "tab2"
+ }
// {
// icon: "el-icon-info",
// label: "选项卡3",
// prop: "tab3",
// },
- ],
+ ]
},
loading: true, //派遣服务公司登记
@@ -152,7 +146,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query: {},
data: [],
@@ -170,10 +164,10 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/dispatcherUnit/import-dispatcherUnit",
+ action: "/api/dispatcherUnit/import-dispatcherUnit"
},
// {
// label: "数据覆盖",
@@ -205,9 +199,9 @@
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
option: {
tip: false,
@@ -218,6 +212,7 @@
menuWidth: 160,
align: "center",
selection: true,
+ menu: false,
...this.$store.state.control.clearOtherBut,
column: [
{
@@ -233,16 +228,17 @@
{
required: true,
message: "请输入派遣单位名称",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "派遣单位类型",
prop: "district",
type: "select",
search: false,
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=dispatcherUnitType",
+ dicUrl:
+ "/api/blade-system/dict-biz/dictionary?code=dispatcherUnitType",
props: {
label: "dictValue",
value: "dictKey"
@@ -256,10 +252,10 @@
{
required: true,
message: "请选择派遣单位类型",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
- dataType: "number",
+ dataType: "number"
},
{
label: "企业名称",
@@ -269,20 +265,20 @@
dicUrl: "",
props: {
label: "title",
- value: "id",
+ value: "id"
},
rules: [
{
required: true,
message: "请选择企业名称",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
labelWidth: 138,
width: 180,
searchLabelWidth: 80,
search: true,
- searchSpan: 4,
+ searchSpan: 4
},
{
label: "保安服务类型",
@@ -292,7 +288,7 @@
searchSpan: 4,
overHidden: true,
// span: 12,
- labelWidth: 138,
+ labelWidth: 138
},
{
label: "合同生效时间",
@@ -313,9 +309,9 @@
{
required: true,
message: "请输入时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "所属辖区",
@@ -331,7 +327,7 @@
dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
checkStrictly: true,
slot: true,
@@ -339,9 +335,9 @@
{
required: false,
message: "请选择所属辖区",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "所属辖区",
@@ -353,12 +349,12 @@
viewDisplay: false,
overHidden: true,
labelWidth: 138,
- width:100,
+ width: 100,
type: "tree",
dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
checkStrictly: true,
slot: true,
@@ -366,14 +362,14 @@
{
required: false,
message: "请选择所属辖区",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: " 派遣单位地址",
prop: "address",
- labelWidth: 138,
+ labelWidth: 138
},
{
label: "合同开始时间",
@@ -387,9 +383,9 @@
{
required: true,
message: "请选择开始时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "合同结束时间",
@@ -403,16 +399,16 @@
{
required: true,
message: "请选择结束时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// searchSpan: 4,
// overHidden: true
},
{
label: " 派遣单位联系人",
prop: "linkman",
- labelWidth: 138,
+ labelWidth: 138
// rules: [
// {
// required: true,
@@ -425,7 +421,7 @@
label: "派遣单位联系方式",
prop: "phone",
labelWidth: 138,
- width: 130,
+ width: 130
},
{
label: " 负责人",
@@ -435,9 +431,9 @@
{
required: true,
message: "请输入负责人",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "负责人联系方式",
@@ -448,15 +444,15 @@
{
required: true,
message: "请输入联系方式",
- trigger: "click",
- },
+ trigger: "click"
+ }
// {
// validator: phones,
// trigger: ["change", "blur"],
// },
- ],
+ ]
},
-
+
{
label: "派遣保安员数",
prop: "num",
@@ -467,14 +463,14 @@
{
required: true,
message: "请输入派遣保安员数",
- trigger: "click",
- },
- ],
- },
- ],
+ trigger: "click"
+ }
+ ]
+ }
+ ]
},
- useifid: 266,
+ useifid: 266
};
},
created() {
@@ -523,22 +519,23 @@
...mapGetters(["userInfo"]),
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
ids1() {
let ids1 = [];
- this.selectionList1.forEach((ele) => {
+ this.selectionList1.forEach(ele => {
ids1.push(ele.id);
});
return ids1.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
- }),
+ userInfo: state => state.user.userInfo
+ })
},
+
methods: {
handleChangeTABS(column) {
this.typeTABS = column;
@@ -570,15 +567,15 @@
form["deptId"] = this.useifid;
}
adddata(form).then(
- (res) => {
+ res => {
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -604,11 +601,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -618,7 +615,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -627,7 +624,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -642,7 +639,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -651,7 +648,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec.toggleSelection();
});
@@ -663,7 +660,7 @@
window.localStorage.setItem("paqiandata", JSON.stringify(row));
this.$router.push({
path: "/dispatchChild",
- query: { rowdispatch: "fromDispatch" },
+ query: { rowdispatch: "fromDispatch" }
});
},
getStartTime() {
@@ -697,13 +694,13 @@
...params,
beginTime: releaseTimeRange[0],
overTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
// values.releaseTimeRange = null;
} else {
values = {
...params,
- ...this.query,
+ ...this.query
};
}
if (this.useifid != 266) {
@@ -717,7 +714,7 @@
page.pageSize,
// Object.assign(params, this.query)
values
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
@@ -733,15 +730,17 @@
}
}
window.localStorage.setItem("paqiandataS", JSON.stringify(this.data));
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading = false;
});
},
handleTemplate() {
- window.open(`/api/dispatcherUnit/export-template?${
- this.website.tokenHeader
- }=${getToken()}&`
- );
+ window.open(
+ `/api/dispatcherUnit/export-template?${
+ this.website.tokenHeader
+ }=${getToken()}&`
+ );
},
handleImport() {
this.excelBox = true;
@@ -751,11 +750,12 @@
this.excelBox = false;
this.refreshChange();
done();
- },
+ }
},
mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
this.typeTABS = this.optionTABS.column[0];
- },
+ }
};
</script>
diff --git a/src/views/dispatch/dispatchChildoperable.vue b/src/views/dispatch/dispatchChildoperable.vue
index aa94c14..7cfd404 100644
--- a/src/views/dispatch/dispatchChildoperable.vue
+++ b/src/views/dispatch/dispatchChildoperable.vue
@@ -1,30 +1,31 @@
<template>
- <basic-container>
- <div
- :class="[
- 'dispatchChildoperable',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'dispatchChildoperable',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec1"
+ v-model="form"
+ :table-loading="loading"
+ :before-open="beforeOpen"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
+ @current-change="currentChange"
+ @on-load="onLoad"
>
- <avue-crud
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec1"
- v-model="form"
- :table-loading="loading"
- :before-open="beforeOpen"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
- @current-change="currentChange"
- >
- </avue-crud>
- </div>
+ </avue-crud>
</basic-container>
</template>
@@ -35,7 +36,7 @@
updateDispatcher,
remove1,
getDispatcherUnitByDeptId,
- overDispatcher,
+ overDispatcher
} from "@/api/dispatch/dispatch";
import { update, getSecurityDispatcherTree } from "@/api/system/user";
import { mapState } from "vuex";
@@ -51,7 +52,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
form: {},
query1: {},
@@ -78,7 +79,7 @@
prop: "dispatcherCompany",
// minWidth: 140,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
},
{
label: "企业名称",
@@ -90,18 +91,18 @@
cascaderItem: ["userIds"],
props: {
label: "title",
- value: "id",
+ value: "id"
},
// dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
rules: [
{
required: true,
message: "请输入企业名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
-
+
{
label: "保安员",
prop: "userIds",
@@ -118,7 +119,7 @@
dicData: [],
props: {
label: "name",
- value: "id",
+ value: "id"
},
//不包含父节点值
leafOnly: true,
@@ -127,20 +128,20 @@
{
required: true,
message: "请选择保安",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "保安员",
prop: "securityName",
// type: "tree",
- width:90,
+ width: 90,
searchSpan: 4,
search: true,
labelWidth: 120,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
// props: {
// label: "realName",
@@ -160,16 +161,16 @@
label: "身份证",
prop: "idCardNo",
overHidden: true,
- width:160,
+ width: 160,
addDisplay: false,
editDisplay: false,
rules: [
{
required: true,
message: "请输入身份证",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -187,7 +188,7 @@
prop: "dispatchertime",
type: "date",
format: "yyyy-MM-dd",
- width:120,
+ width: 120,
valueFormat: "yyyy-MM-dd",
labelWidth: 120,
searchSpan: 5,
@@ -197,16 +198,16 @@
{
required: true,
message: "请输入派遣时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// overHidden: true
},
{
label: "结束时间",
prop: "endTime",
type: "date",
- width:120,
+ width: 120,
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
labelWidth: 120,
@@ -215,9 +216,9 @@
{
required: true,
message: "请输入结束时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -240,9 +241,9 @@
{
required: true,
message: "请输入时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "派遣单位",
@@ -252,7 +253,7 @@
// dicUrl: "/api/dispatcherUnit/page-tree?deptId={{key}}",
props: {
label: "name",
- value: "id",
+ value: "id"
},
hide: true,
searchSpan: 4,
@@ -263,9 +264,9 @@
{
required: true,
message: "请输入派遣单位",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "派遣地址",
@@ -275,16 +276,16 @@
{
required: true,
message: "请输入派遣地址",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
- },
- ],
+ }
+ ]
},
- useifid: 266,
+ useifid: 266
};
},
created() {
@@ -338,17 +339,17 @@
// },
ids1() {
let ids1 = [];
- this.selectionList1.forEach((ele) => {
+ this.selectionList1.forEach(ele => {
ids1.push(ele.id);
});
return ids1.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
+ userInfo: state => state.user.userInfo
}),
deps() {
return this.form.deptId;
- },
+ }
},
methods: {
@@ -388,16 +389,16 @@
(form["ids"] = form.userIds.join(",")), delete form.userIds;
// console.log(form, 321);
saveDispatcher(form).then(
- (res) => {
+ res => {
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.onLoad(this.page, this.query1);
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
this.onLoad(this.page, this.query1);
@@ -424,11 +425,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -438,7 +439,7 @@
this.$confirm("确定结束当前派遣?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return overDispatcher(row);
@@ -447,7 +448,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -462,7 +463,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(this.ids1);
@@ -471,7 +472,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec1.toggleSelection();
});
@@ -532,13 +533,13 @@
...params,
beginTime: releaseTimeRange[0],
overTime: releaseTimeRange[1],
- ...this.query1,
+ ...this.query1
};
values.releaseTimeRange = null;
} else {
values = {
...params,
- ...this.query1,
+ ...this.query1
};
}
@@ -563,10 +564,11 @@
page.pageSize,
// Object.assign(params, this.query)
values
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading = false;
// this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
});
@@ -574,7 +576,7 @@
initData(type) {
var that = this;
if (type == 1) {
- getDispatcherUnitByDeptId(null).then((res) => {
+ getDispatcherUnitByDeptId(null).then(res => {
const dispatcherUnitIdColumn = that.findObject(
this.option.column,
"dispatcherUnitId"
@@ -583,19 +585,19 @@
});
}
if (type == 2) {
- getDispatcherUnitByDeptId(that.userInfo.dept_id).then((res) => {
+ getDispatcherUnitByDeptId(that.userInfo.dept_id).then(res => {
const dispatcherUnitIdColumn = that.findObject(
this.option.column,
"dispatcherUnitId"
);
dispatcherUnitIdColumn.dicData = res.data.data;
});
- getSecurityDispatcherTree(that.userInfo.dept_id, 1).then((res) => {
+ getSecurityDispatcherTree(that.userInfo.dept_id, 1).then(res => {
const userIdsColumn = that.findObject(this.option.column, "userIds");
userIdsColumn.dicData = res.data.data;
});
}
- },
+ }
},
// watch: {
// // "form.deptId"() {
@@ -605,8 +607,9 @@
// }
// },
mounted() {
- this.onLoad(this.page, this.query1);
- },
+ this.$store.commit("setWindowSizeHeightAdd");
+ // this.onLoad(this.page, this.query1);
+ }
};
</script>
diff --git a/src/views/dispatch/dispatchChildoperableSee.vue b/src/views/dispatch/dispatchChildoperableSee.vue
index 5fa188e..13c450c 100644
--- a/src/views/dispatch/dispatchChildoperableSee.vue
+++ b/src/views/dispatch/dispatchChildoperableSee.vue
@@ -1,29 +1,30 @@
<template>
- <basic-container>
- <div
- :class="[
- 'dispatchChildoperable',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'dispatchChildoperable',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option1"
+ :data="data1"
+ :page.sync="page1"
+ ref="crudrec1"
+ v-model="form"
+ :table-loading="loading1"
+ :before-open="beforeOpen"
+ @row-save="rowSave1"
+ @search-change="searchChange1"
+ @search-reset="searchReset1"
+ @row-update="rowUpdate1"
+ @row-del="rowDel1"
+ @selection-change="selectionChange1"
+ @refresh-change="refreshChange1"
+ @on-load="onLoad1"
>
- <avue-crud
- :option="option1"
- :data="data1"
- :page.sync="page1"
- ref="crudrec1"
- v-model="form"
- :table-loading="loading1"
- :before-open="beforeOpen"
- @row-save="rowSave1"
- @search-change="searchChange1"
- @search-reset="searchReset1"
- @row-update="rowUpdate1"
- @row-del="rowDel1"
- @selection-change="selectionChange1"
- @refresh-change="refreshChange1"
- >
- </avue-crud>
- </div>
+ </avue-crud>
</basic-container>
</template>
@@ -34,7 +35,7 @@
update1,
remove1,
getDispatcherUnitByDeptId,
- overDispatcher,
+ overDispatcher
} from "@/api/dispatch/dispatch";
import { update, getListByDeptId } from "@/api/system/user";
import { mapState } from "vuex";
@@ -51,7 +52,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
form: {},
query1: {},
@@ -69,6 +70,7 @@
editBtnText: "变更派遣",
// addBtn: false,
// menuWidth: 160,
+ menu: false,
align: "center",
selection: true,
...this.$store.state.control.clearOtherBut,
@@ -84,7 +86,7 @@
// searchSpan: 4,
minWidth: 210,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
},
{
label: "保安公司",
@@ -97,7 +99,7 @@
cascaderItem: ["userIds"],
props: {
label: "title",
- value: "id",
+ value: "id"
},
width: 180,
dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
@@ -105,9 +107,9 @@
{
required: true,
message: "请输入保安公司",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "派遣单位",
@@ -117,7 +119,7 @@
// dicUrl: "/api/dispatcherUnit/page-tree?deptId={{key}}",
props: {
label: "name",
- value: "id",
+ value: "id"
},
hide: true,
searchSpan: 4,
@@ -128,9 +130,9 @@
{
required: true,
message: "请输入派遣单位",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "保安员",
@@ -144,7 +146,7 @@
hide: true,
props: {
label: "realName",
- value: "id",
+ value: "id"
},
// dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
@@ -153,9 +155,9 @@
{
required: true,
message: "请选择保安",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "保安员",
@@ -177,9 +179,9 @@
{
required: true,
message: "请选择保安",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
@@ -193,9 +195,9 @@
{
required: true,
message: "请输入身份证",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -222,9 +224,9 @@
{
required: true,
message: "请输入派遣时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// overHidden: true
},
{
@@ -239,9 +241,9 @@
{
required: true,
message: "请输入结束时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -264,9 +266,9 @@
{
required: true,
message: "请输入时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "派遣地址",
@@ -276,15 +278,15 @@
{
required: true,
message: "请输入派遣地址",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
- },
- ],
- },
+ }
+ ]
+ }
};
},
created() {
@@ -306,17 +308,17 @@
// },
ids1() {
let ids1 = [];
- this.selectionList1.forEach((ele) => {
+ this.selectionList1.forEach(ele => {
ids1.push(ele.id);
});
return ids1.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
+ userInfo: state => state.user.userInfo
}),
deps() {
return this.form.deptId;
- },
+ }
},
methods: {
@@ -352,15 +354,15 @@
// }
adddata1(form).then(
- (res) => {
+ res => {
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -387,11 +389,11 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -401,7 +403,7 @@
this.$confirm("确定结束当前派遣?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return overDispatcher(row);
@@ -410,7 +412,7 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -425,7 +427,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(this.ids1);
@@ -434,7 +436,7 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec1.toggleSelection();
});
@@ -480,13 +482,13 @@
...params,
beginTime: releaseTimeRange[0],
overTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
values.releaseTimeRange = null;
} else {
values = {
...params,
- ...this.query,
+ ...this.query
};
}
@@ -505,19 +507,20 @@
page.pageSize,
// Object.assign(params, this.query)
values
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page1.total = data.total;
this.data1 = data.records;
this.loading1 = false;
// this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
- console.log(this.form, 111111);
+ this.$store.commit("setWindowSizeHeightAdd");
+ // console.log(this.form, 111111);
});
},
initData(type) {
var that = this;
if (type == 1) {
- getDispatcherUnitByDeptId(null).then((res) => {
+ getDispatcherUnitByDeptId(null).then(res => {
const dispatcherUnitIdColumn = that.findObject(
this.option1.column,
"dispatcherUnitId"
@@ -526,19 +529,19 @@
});
}
if (type == 2) {
- getDispatcherUnitByDeptId(that.userInfo.dept_id).then((res) => {
+ getDispatcherUnitByDeptId(that.userInfo.dept_id).then(res => {
const dispatcherUnitIdColumn = that.findObject(
this.option1.column,
"dispatcherUnitId"
);
dispatcherUnitIdColumn.dicData = res.data.data;
});
- getListByDeptId(that.userInfo.dept_id, 1).then((res) => {
+ getListByDeptId(that.userInfo.dept_id, 1).then(res => {
const userIdsColumn = that.findObject(this.option1.column, "userIds");
userIdsColumn.dicData = res.data.data;
});
}
- },
+ }
},
// watch: {
// // "form.deptId"() {
@@ -548,8 +551,9 @@
// }
// },
mounted() {
- this.onLoad1(this.page1, this.query1);
- },
+ this.$store.commit("setWindowSizeHeightAdd");
+ // this.onLoad1(this.page1, this.query1);
+ }
};
</script>
diff --git a/src/views/exam/examPayment.vue b/src/views/exam/examPayment.vue
index 25fa2ca..2928b5f 100644
--- a/src/views/exam/examPayment.vue
+++ b/src/views/exam/examPayment.vue
@@ -1,108 +1,92 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-05 16:31:54
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-23 14:20:02
- * menu-name 考试缴费管理
- */
+/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
+@Last Modified time: 2021-11-23 14:20:02 * menu-name 考试缴费管理 */
<template>
- <el-row class="morpheus-box">
- <el-col
- :span="24"
- :class="[
- 'recruitmentManagement',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ v-model="obj"
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :permission="permissionList"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ ref="questionBankCrud"
+ :page.sync="questionBankPage"
+ @on-load="questionBankOnLoad"
+ @selection-change="questionBankSelectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-del="rowDel"
+ @row-update="questionBankRowUpdate"
+ @refresh-change="refreshChange"
>
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
- >
- <avue-crud
- v-model="obj"
- class="company-box"
- :option="questionBankOption"
- :permission="permissionList"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- ref="questionBankCrud"
- :page.sync="questionBankPage"
- @on-load="questionBankOnLoad"
- @selection-change="questionBankSelectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-del="rowDel"
- @row-update="questionBankRowUpdate"
- @refresh-change="refreshChange"
- >
- <template slot-scope="{ row }" slot="sex">
- <el-tag v-if="row.sex == 1">男</el-tag>
- <el-tag v-if="row.sex == 2">女</el-tag>
- </template>
+ <template slot-scope="{ row }" slot="sex">
+ <el-tag v-if="row.sex == 1">男</el-tag>
+ <el-tag v-if="row.sex == 2">女</el-tag>
+ </template>
- <!-- 自定义按钮 -->
- <template slot="menuLeft">
- <!-- <el-button type="danger"
+ <!-- 自定义按钮 -->
+ <template slot="menuLeft">
+ <!-- <el-button type="danger"
size="mini"
icon="el-icon-delete"
plain
@click="handleDelete">新增
</el-button> -->
- <!-- <el-button type="danger"
+ <!-- <el-button type="danger"
size="mini"
icon="el-icon-delete"
plain
@click="handleDelete">删除
</el-button> -->
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- v-if="permission.performance_import"
- @click="handleImport"
- >缴费凭证批量上传
- </el-button>
- </template>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ v-if="permission.performance_import"
+ @click="handleImport"
+ >缴费凭证批量上传
+ </el-button>
+ </template>
- <template slot-scope="{ row }" slot="menu">
- <el-button
- style="display: none"
- type="text"
- size="mini"
- icon="el-icon-collection"
- class="start-kaoshi"
- v-if="permission.performance_print"
- :disabled="row.qualified == 1"
- @click="securityPrint(row)"
- >保安证打印
- </el-button>
- </template>
- </avue-crud>
+ <template slot-scope="{ row }" slot="menu">
+ <el-button
+ style="display: none"
+ type="text"
+ size="mini"
+ icon="el-icon-collection"
+ class="start-kaoshi"
+ v-if="permission.performance_print"
+ :disabled="row.qualified == 1"
+ @click="securityPrint(row)"
+ >保安证打印
+ </el-button>
+ </template>
+ </avue-crud>
- <el-dialog
- title="缴费凭证批量上传"
- append-to-body
- :visible.sync="excelBox"
- width="555px"
- >
- <avue-form
- :option="excelOption"
- v-model="excelForm"
- :upload-after="uploadAfter"
- >
- </avue-form>
- </el-dialog>
- </div>
- </el-card>
- </el-col>
- </el-row>
+ <el-dialog
+ title="缴费凭证批量上传"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
+ >
+ </avue-form>
+ </el-dialog>
+ </basic-container>
</template>
<script>
@@ -114,7 +98,7 @@
data() {
return {
obj: {
- name: "张三",
+ name: "张三"
},
excelBox: false,
questionBankOption: {
@@ -161,13 +145,13 @@
label: "缴费人",
prop: "realName",
search: true,
- searchSpan: 4,
+ searchSpan: 4
},
{
label: "身份证号",
prop: "idCardNo",
search: true,
- searchSpan: 4,
+ searchSpan: 4
},
{
label: "性别",
@@ -176,23 +160,23 @@
dicData: [
{
label: "男",
- value: 1,
+ value: 1
},
{
label: "女",
- value: 2,
- },
- ],
+ value: 2
+ }
+ ]
},
{
label: "联系方式",
- prop: "phone",
+ prop: "phone"
},
{
label: "所在单位",
prop: "deptName",
search: true,
- searchSpan: 6,
+ searchSpan: 6
},
// {
// label: "缴费状态",
@@ -220,7 +204,7 @@
prop: "certificateUrl",
overHidden: true,
type: "upload",
- listType: "picture-img",
+ listType: "picture-img"
},
{
label: "缴费时间",
@@ -236,11 +220,11 @@
{
required: true,
message: "请输入时间",
- trigger: "click",
- },
- ],
- },
- ],
+ trigger: "click"
+ }
+ ]
+ }
+ ]
},
questionBankSearch: {},
questionBankLoading: true,
@@ -249,7 +233,7 @@
pageSize: 10,
currentPage: 1,
total: 16,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
questionBankQuery: {},
questionBankSelectionList: [],
@@ -266,14 +250,13 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 zip 压缩文件",
- action:
- "/api/blade-resource/oss/endpoint/put-file-exam-payment-zip",
- },
- ],
- },
+ action: "/api/blade-resource/oss/endpoint/put-file-exam-payment-zip"
+ }
+ ]
+ }
};
},
computed: {
@@ -284,12 +267,14 @@
viewBtn: this.vaildData(this.permission.notice_view, false),
delBtn: this.vaildData(this.permission.notice_delete, false),
editBtn: this.vaildData(this.permission.performance__edit, false),
- excelBtn: this.vaildData(this.permission.performance_export, false),
+ excelBtn: this.vaildData(this.permission.performance_export, false)
};
- },
+ }
},
created() {},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
questionBankOnLoad(page, params = {}) {
//判断角色，如果是保安公司管理员或保安，只能查看当前公司的考试成绩
@@ -302,11 +287,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
that.questionBankPage.total = data.total;
that.questionBankData = data.records;
that.questionBankLoading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
that.questionBankSelectionClear();
});
},
@@ -315,7 +301,7 @@
this.$confirm("确定删除当前缴费数据?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -324,7 +310,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -358,17 +344,17 @@
theoryGrade: row.theoryGrade,
learnGrade: row.learnGrade,
examId: row.examId,
- id: row.id,
+ id: row.id
}).then(
() => {
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -385,10 +371,9 @@
},
refreshChange() {
this.questionBankOnLoad(this.questionBankPage, this.questionBankQuery);
- },
- },
+ }
+ }
};
</script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/exam/performance.vue b/src/views/exam/performance.vue
index 94b2325..7a57a66 100644
--- a/src/views/exam/performance.vue
+++ b/src/views/exam/performance.vue
@@ -1,126 +1,110 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-05 16:31:54
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-23 14:17:22
- * menu-name 成绩管理
- */
+/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
+@Last Modified time: 2021-11-23 14:17:22 * menu-name 成绩管理 */
<template>
- <el-row class="morpheus-box">
- <el-col
- :span="24"
- :class="[
- 'recruitmentManagement',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ v-model="obj"
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :permission="permissionList"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ ref="questionBankCrud"
+ :page.sync="questionBankPage"
+ @on-load="questionBankOnLoad"
+ @selection-change="questionBankSelectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-update="questionBankRowUpdate"
>
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
- >
- <avue-crud
- v-model="obj"
- class="company-box"
- :option="questionBankOption"
- :permission="permissionList"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- ref="questionBankCrud"
- :page.sync="questionBankPage"
- @on-load="questionBankOnLoad"
- @selection-change="questionBankSelectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-update="questionBankRowUpdate"
- >
- <template slot-scope="{ row }" slot="theoryGrade">
- {{ row.theoryGrade == -1 ? "" : row.theoryGrade }}
- </template>
- <template slot-scope="{ row }" slot="learnGrade">
- {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
- </template>
- <template slot-scope="{ row }" slot="allGrade">
- {{ row.allGrade == -1 ? "" : row.allGrade }}
- </template>
- <template slot-scope="{ row }" slot="qualified">
- {{
- row.qualified == -1
- ? ""
- : row.qualified == 0
- ? "合格"
- : row.qualified == 1
- ? "不合格"
- : ""
- }}
- </template>
+ <template slot-scope="{ row }" slot="theoryGrade">
+ {{ row.theoryGrade == -1 ? "" : row.theoryGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="learnGrade">
+ {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="allGrade">
+ {{ row.allGrade == -1 ? "" : row.allGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="qualified">
+ {{
+ row.qualified == -1
+ ? ""
+ : row.qualified == 0
+ ? "合格"
+ : row.qualified == 1
+ ? "不合格"
+ : ""
+ }}
+ </template>
- <!-- 自定义按钮 -->
- <template slot="menuLeft">
- <!-- <el-button type="danger"
+ <!-- 自定义按钮 -->
+ <template slot="menuLeft">
+ <!-- <el-button type="danger"
size="mini"
icon="el-icon-delete"
plain
@click="handleDelete">新增
</el-button> -->
- <!-- <el-button type="danger"
+ <!-- <el-button type="danger"
size="mini"
icon="el-icon-delete"
plain
@click="handleDelete">删除
</el-button> -->
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- v-if="permission.performance_import"
- @click="handleImport"
- >实操成绩导入
- </el-button>
- </template>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ v-if="permission.performance_import"
+ @click="handleImport"
+ >实操成绩导入
+ </el-button>
+ </template>
- <template slot-scope="{ row }" slot="menu">
- <el-button
- type="text"
- size="mini"
- icon="el-icon-collection"
- class="start-kaoshi"
- v-if="permission.performance_print"
- :disabled="row.qualified == 1"
- @click="securityPrint(row)"
- >保安证打印
- </el-button>
- </template>
- </avue-crud>
+ <template slot-scope="{ row }" slot="menu">
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-collection"
+ class="start-kaoshi"
+ v-if="permission.performance_print"
+ :disabled="row.qualified == 1"
+ @click="securityPrint(row)"
+ >保安证打印
+ </el-button>
+ </template>
+ </avue-crud>
- <el-dialog
- title="实操成绩导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px"
- >
- <avue-form
- :option="excelOption"
- v-model="excelForm"
- :upload-after="uploadAfter"
- >
- <template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
- 点击下载<i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog>
- </div>
- </el-card>
- </el-col>
- </el-row>
+ <el-dialog
+ title="实操成绩导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
+ >
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
+ </avue-form>
+ </el-dialog>
+ </basic-container>
</template>
<script>
@@ -147,7 +131,7 @@
return {
obj: {
- name: "张三",
+ name: "张三"
},
excelBox: false,
questionBankOption: {
@@ -200,11 +184,11 @@
{
required: true,
message: "请输入试卷名称",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
// overHidden: true,
- width: 230,
+ width: 230
},
{
label: "用户名",
@@ -228,10 +212,10 @@
{
required: true,
message: "请输入保安姓名",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 160,
+ width: 160
},
{
label: "所属公司",
@@ -260,10 +244,10 @@
{
required: true,
message: "请输入所属公司",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 250,
+ width: 250
},
{
label: "考试开始时间",
@@ -285,7 +269,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "考试结束时间",
@@ -307,7 +291,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "状态",
@@ -319,12 +303,12 @@
dicData: [
{
label: "发布成绩",
- value: 2,
+ value: 2
},
{
label: "考试中",
- value: 3,
- },
+ value: 3
+ }
],
// 表单新增时是否禁止
addDisabled: false,
@@ -342,9 +326,9 @@
{
required: true,
message: "请输入考试名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "理论成绩",
@@ -361,7 +345,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "实操成绩",
@@ -380,8 +364,8 @@
// 表单编辑时是否为查看模式
editDetail: false,
rules: [
- { validator: validatePass, required: true, trigger: "blur" },
- ],
+ { validator: validatePass, required: true, trigger: "blur" }
+ ]
},
{
label: "总成绩",
@@ -403,9 +387,9 @@
{
required: true,
message: "请输入考试名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "是否合格",
@@ -417,16 +401,16 @@
dicData: [
{
label: "合格",
- value: 0,
+ value: 0
},
{
label: "不合格",
- value: 1,
+ value: 1
},
{
label: "暂未录实操成绩",
- value: 2,
- },
+ value: 2
+ }
],
// 表单新增时是否禁止
addDisabled: false,
@@ -444,11 +428,11 @@
{
required: true,
message: "请输入考试名称",
- trigger: "blur",
- },
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
},
questionBankSearch: {},
questionBankLoading: true,
@@ -457,7 +441,7 @@
pageSize: 10,
currentPage: 1,
total: 16,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
questionBankQuery: {},
questionBankSelectionList: [],
@@ -474,10 +458,10 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/examScore/import-examScore",
+ action: "/api/examScore/import-examScore"
},
// {
// label: "数据覆盖",
@@ -509,10 +493,10 @@
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
- },
+ span: 24
+ }
+ ]
+ }
};
},
computed: {
@@ -523,20 +507,22 @@
viewBtn: this.vaildData(null, false),
delBtn: this.vaildData(null, false),
editBtn: this.vaildData(this.permission.performance__edit, false),
- excelBtn: this.vaildData(this.permission.performance_export, false),
+ excelBtn: this.vaildData(this.permission.performance_export, false)
};
- },
+ }
},
created() {},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
questionBankOnLoad(page, params = {}) {
//判断角色，如果是保安公司管理员或保安，只能查看当前公司的考试成绩
var that = this;
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
+ roleIds.forEach(roleId => {
+ getRoleDetail(roleId).then(res => {
var roleAlias = res.data.data.roleAlias;
if (
roleAlias == "保安公司管理员" ||
@@ -552,11 +538,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
that.questionBankPage.total = data.total;
that.questionBankData = data.records;
that.questionBankLoading = false;
+ that.$store.commit("setWindowSizeHeightAdd");
that.questionBankSelectionClear();
});
});
@@ -591,7 +578,7 @@
obj["name"] = "保安证";
this.$router.push({
path: `/exam/papers`,
- query: obj,
+ query: obj
});
},
@@ -601,17 +588,17 @@
theoryGrade: row.theoryGrade,
learnGrade: row.learnGrade,
examId: row.examId,
- id: row.id,
+ id: row.id
}).then(
() => {
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -631,10 +618,9 @@
},
refreshChange() {
this.questionBankOnLoad(this.page, this.query);
- },
- },
+ }
+ }
};
</script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/exam/singleperformance.vue b/src/views/exam/singleperformance.vue
index 2818aa9..76399f6 100644
--- a/src/views/exam/singleperformance.vue
+++ b/src/views/exam/singleperformance.vue
@@ -1,73 +1,66 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-05 16:31:54
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-23 14:18:07
- * menu-name 成绩查看
- */
+/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
+@Last Modified time: 2021-11-23 14:18:07 * menu-name 成绩查看 */
<template>
- <el-row class="morpheus-box-score">
- <el-col :span="24">
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
- >
- <avue-crud
- v-model="obj"
- class="company-box"
- :option="questionBankOption"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- ref="questionBankCrud"
- :page.sync="questionBankPage"
- @on-load="questionBankOnLoad"
- @selection-change="questionBankSelectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-update="questionBankRowUpdate"
- >
- <template slot-scope="{ row }" slot="learnGrade">
- {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
- </template>
- <template slot-scope="{ row }" slot="theoryGrade">
- {{ row.learnGrade == -1 ? "" : row.theoryGrade }}
- </template>
- <template slot-scope="{ row }" slot="allGrade">
- {{ row.learnGrade == -1 ? "" : row.allGrade }}
- </template>
- <template slot-scope="{ row }" slot="qualified">
- {{
- row.learnGrade == -1
- ? ""
- : row.qualified == 0
- ? "合格"
- : row.qualified == 1
- ? "不合格"
- : ""
- }}
- </template>
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ v-model="obj"
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ ref="questionBankCrud"
+ :page.sync="questionBankPage"
+ @on-load="questionBankOnLoad"
+ @selection-change="questionBankSelectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-update="questionBankRowUpdate"
+ >
+ <template slot-scope="{ row }" slot="learnGrade">
+ {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="theoryGrade">
+ {{ row.learnGrade == -1 ? "" : row.theoryGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="allGrade">
+ {{ row.learnGrade == -1 ? "" : row.allGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="qualified">
+ {{
+ row.learnGrade == -1
+ ? ""
+ : row.qualified == 0
+ ? "合格"
+ : row.qualified == 1
+ ? "不合格"
+ : ""
+ }}
+ </template>
- <template slot-scope="{ row }" slot="menu">
- <el-button
- type="text"
- size="mini"
- icon="el-icon-collection"
- class="start-kaoshi"
- :disabled="row.qualified == 1"
- v-if="permission.singleperformance_print"
- @click="securityPrint(row)"
- >保安证打印
- </el-button>
- </template>
+ <template slot-scope="{ row }" slot="menu">
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-collection"
+ class="start-kaoshi"
+ :disabled="row.qualified == 1"
+ v-if="permission.singleperformance_print"
+ @click="securityPrint(row)"
+ >保安证打印
+ </el-button>
+ </template>
- <!-- 自定义按钮 -->
- <!-- <template slot="menuLeft">
+ <!-- 自定义按钮 -->
+ <!-- <template slot="menuLeft">
<el-button type="danger"
size="mini"
icon="el-icon-delete"
@@ -87,11 +80,8 @@
@click="handleDelete">导出
</el-button>
</template> -->
- </avue-crud>
- </div>
- </el-card>
- </el-col>
- </el-row>
+ </avue-crud>
+ </basic-container>
</template>
<script>
@@ -119,7 +109,7 @@
return {
obj: {
- name: "张三",
+ name: "张三"
},
questionBankOption: {
// 操作栏多余按钮去除
@@ -172,11 +162,11 @@
{
required: true,
message: "请输入试卷名称",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
// overHidden:true,
- width: 230,
+ width: 230
},
{
label: "用户名",
@@ -200,10 +190,10 @@
{
required: true,
message: "请输入保安姓名",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 160,
+ width: 160
},
{
label: "所属公司",
@@ -232,10 +222,10 @@
{
required: true,
message: "请输入所属公司",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 250,
+ width: 250
},
{
label: "考试开始时间",
@@ -257,7 +247,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "考试结束时间",
@@ -279,7 +269,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "状态",
@@ -291,12 +281,12 @@
dicData: [
{
label: "发布成绩",
- value: 2,
+ value: 2
},
{
label: "考试中",
- value: 3,
- },
+ value: 3
+ }
],
// 表单新增时是否禁止
addDisabled: false,
@@ -314,9 +304,9 @@
{
required: true,
message: "请输入考试名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "理论成绩",
@@ -333,7 +323,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "实操成绩",
@@ -352,8 +342,8 @@
// 表单编辑时是否为查看模式
editDetail: false,
rules: [
- { validator: validatePass, required: true, trigger: "blur" },
- ],
+ { validator: validatePass, required: true, trigger: "blur" }
+ ]
},
{
label: "总成绩",
@@ -375,9 +365,9 @@
{
required: true,
message: "请输入考试名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "是否合格",
@@ -389,16 +379,16 @@
dicData: [
{
label: "合格",
- value: 0,
+ value: 0
},
{
label: "不合格",
- value: 1,
+ value: 1
},
{
label: "暂未录实操成绩",
- value: 2,
- },
+ value: 2
+ }
],
// 表单新增时是否禁止
addDisabled: false,
@@ -416,11 +406,11 @@
{
required: true,
message: "请输入考试名称",
- trigger: "blur",
- },
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
},
questionBankSearch: {},
questionBankLoading: true,
@@ -429,10 +419,10 @@
pageSize: 10,
currentPage: 1,
total: 16,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
questionBankQuery: {},
- questionBankSelectionList: [],
+ questionBankSelectionList: []
};
},
computed: {
@@ -446,12 +436,14 @@
excelBtn: this.vaildData(
this.permission.singleperformance_export,
false
- ),
+ )
};
- },
+ }
},
created() {},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
//保安证证查看
securityPrint(row) {
@@ -459,7 +451,7 @@
obj["name"] = "保安证";
this.$router.push({
path: `/exam/papers`,
- query: obj,
+ query: obj
});
},
questionBankOnLoad(page, params = {}) {
@@ -467,8 +459,8 @@
var that = this;
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
+ roleIds.forEach(roleId => {
+ getRoleDetail(roleId).then(res => {
var roleAlias = res.data.data.roleAlias;
if (
roleAlias == "保安公司管理员" ||
@@ -484,11 +476,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
that.questionBankPage.total = data.total;
that.questionBankData = data.records;
that.questionBankLoading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
that.questionBankSelectionClear();
});
});
@@ -522,25 +515,24 @@
update({
theoryGrade: row.theoryGrade,
learnGrade: row.learnGrade,
- id: row.id,
+ id: row.id
}).then(
() => {
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
);
- },
- },
+ }
+ }
};
</script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/exam/startexam.vue b/src/views/exam/startexam.vue
index 27bf0c0..7fa8922 100644
--- a/src/views/exam/startexam.vue
+++ b/src/views/exam/startexam.vue
@@ -1,42 +1,35 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-05 16:31:54
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-23 14:16:42
- * menu-name 考试管理
- */
+/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
+@Last Modified time: 2021-11-23 14:16:42 * menu-name 考试管理 */
<template>
- <el-row class="morpheus-box-paper">
- <el-col :span="24">
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
- >
- <avue-crud
- v-model="form"
- class="company-box"
- :option="questionBankOption"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- :permission="permissionList"
- ref="questionBankCrud"
- :page.sync="questionBankPage"
- @on-load="questionBankOnLoad"
- @selection-change="questionBankSelectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-save="questionBankRowSave"
- @row-update="questionBankRowUpdate"
- @row-del="questionBankRowDel"
- >
- <!-- 自定义按钮 -->
- <!-- <template slot="menuLeft">
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ v-model="form"
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ :permission="permissionList"
+ ref="questionBankCrud"
+ :page.sync="questionBankPage"
+ @on-load="questionBankOnLoad"
+ @selection-change="questionBankSelectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-save="questionBankRowSave"
+ @row-update="questionBankRowUpdate"
+ @row-del="questionBankRowDel"
+ >
+ <!-- 自定义按钮 -->
+ <!-- <template slot="menuLeft">
<el-button type="danger"
size="mini"
icon="el-icon-delete"
@@ -57,38 +50,35 @@
</el-button>
</template> -->
- <template slot="menuLeft">
- <el-button
- style="display: none"
- type="danger"
- size="small"
- icon="el-icon-delete"
- v-if="permission.startexam_delete"
- @click="questionBankHandleDelete"
- >删 除
- </el-button>
- </template>
+ <template slot="menuLeft">
+ <el-button
+ style="display: none"
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ v-if="permission.startexam_delete"
+ @click="questionBankHandleDelete"
+ >删 除
+ </el-button>
+ </template>
- <template slot-scope="{ row }" slot="examStatus">
- <el-tag>{{ row.examStatus == 0 ? "已发布" : "草稿" }}</el-tag>
- </template>
+ <template slot-scope="{ row }" slot="examStatus">
+ <el-tag>{{ row.examStatus == 0 ? "已发布" : "草稿" }}</el-tag>
+ </template>
- <template slot-scope="{ row }" slot="menu">
- <el-button
- type="text"
- size="mini"
- icon="el-icon-collection"
- class="start-kaoshi"
- v-if="permission.startexam_applyPapers"
- @click="startExam(row)"
- >报名清册
- </el-button>
- </template>
- </avue-crud>
- </div>
- </el-card>
- </el-col>
- </el-row>
+ <template slot-scope="{ row }" slot="menu">
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-collection"
+ class="start-kaoshi"
+ v-if="permission.startexam_applyPapers"
+ @click="startExam(row)"
+ >报名清册
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
</template>
<script>
@@ -140,6 +130,7 @@
labelWidth: 140,
...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.searchOpen,
column: [
{
label: "考试名称",
@@ -163,9 +154,9 @@
{
required: true,
message: "请输入试卷名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
// {
// label: "试卷分数",
@@ -241,9 +232,9 @@
{
required: true,
message: "请选择考试时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
// {
// label: "考试结束时间",
@@ -283,7 +274,7 @@
// 表单编辑时是否为查看模式
editDetail: false,
hide: true,
- display: false,
+ display: false
},
{
label: "备注",
@@ -301,7 +292,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "注意事项",
@@ -321,9 +312,9 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 240,
- },
- ],
+ width: 240
+ }
+ ]
},
questionBankSearch: {},
questionBankLoading: true,
@@ -332,18 +323,20 @@
pageSize: 10,
currentPage: 1,
total: 16,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
questionBankQuery: {},
- questionBankSelectionList: [],
+ questionBankSelectionList: []
};
},
created() {},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
computed: {
ids() {
let ids = [];
- this.questionBankSelectionList.forEach((ele) => {
+ this.questionBankSelectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
@@ -354,9 +347,9 @@
addBtn: this.vaildData(this.permission.startexam_add, false),
viewBtn: this.vaildData(this.permission.startexam_view, false),
delBtn: this.vaildData(this.permission.startexam_delete, false),
- editBtn: this.vaildData(this.permission.startexam_edit, false),
+ editBtn: this.vaildData(this.permission.startexam_edit, false)
};
- },
+ }
},
watch: {},
methods: {
@@ -367,11 +360,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.questionBankQuery)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.questionBankPage.total = data.total;
this.questionBankData = data.records;
this.questionBankLoading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.questionBankSelectionClear();
});
},
@@ -404,7 +398,7 @@
if (row.examType == 1) {
this.$router.push({
path: `/applydetailed`,
- query: row,
+ query: row
});
}
@@ -412,7 +406,7 @@
if (row.examType == 2) {
this.$router.push({
path: `/trainApply`,
- query: row,
+ query: row
});
}
},
@@ -427,11 +421,11 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -449,11 +443,11 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -463,7 +457,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -472,7 +466,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -484,7 +478,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -493,14 +487,13 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.questionBankCrud.toggleSelection();
});
- },
- },
+ }
+ }
};
</script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/exam/subject.vue b/src/views/exam/subject.vue
index ad8b43f..7e992a7 100644
--- a/src/views/exam/subject.vue
+++ b/src/views/exam/subject.vue
@@ -1,122 +1,110 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-05 16:31:54
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-23 14:14:38
- * menu-name 题库查询
- */
+/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
+@Last Modified time: 2021-11-23 14:14:38 * menu-name 题库查询 */
<template>
- <div>
- <el-row class="morpheus-box">
- <el-col :span="24">
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
- >
- <avue-crud
- class="company-box"
- :option="questionBankOption"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- ref="questionBankCrud"
- :permission="permissionList"
- :page.sync="questionBankPage"
- @on-load="questionBankOnLoad"
- @selection-change="questionBankSelectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-del="questionBankHandleDel"
- >
- <template slot="menuLeft">
- <el-button
- type="primary"
- size="small"
- icon="el-icon-plus"
- v-if="permission.subject_add"
- @click="questionBankHandleAdd"
- >新 增
- </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- v-if="permission.subject_import"
- @click="handleImport"
- >题库导入
- </el-button>
- <el-button
- type="danger"
- size="small"
- icon="el-icon-delete"
- v-if="permission.subject_delete"
- @click="questionBankHandleDelete"
- >删 除
- </el-button>
- </template>
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ ref="questionBankCrud"
+ :permission="permissionList"
+ :page.sync="questionBankPage"
+ @on-load="questionBankOnLoad"
+ @selection-change="questionBankSelectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-del="questionBankHandleDel"
+ >
+ <template slot="menuLeft">
+ <el-button
+ type="primary"
+ size="small"
+ icon="el-icon-plus"
+ v-if="permission.subject_add"
+ @click="questionBankHandleAdd"
+ >新 增
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ v-if="permission.subject_import"
+ @click="handleImport"
+ >题库导入
+ </el-button>
+ <el-button
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ v-if="permission.subject_delete"
+ @click="questionBankHandleDelete"
+ >删 除
+ </el-button>
+ </template>
- <template slot-scope="{ row }" slot="menu">
- <el-button
- type="text"
- size="mini"
- icon="el-icon-edit"
- v-if="permission.subject_edit"
- @click="questionBankHandleAdd(row)"
- >编辑
- </el-button>
- <el-button
- type="text"
- size="mini"
- icon="el-icon-delete"
- v-if="permission.subject_delete"
- @click="questionBankHandleDel(row)"
- >删除
- </el-button>
- </template>
- </avue-crud>
+ <template slot-scope="{ row }" slot="menu">
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-edit"
+ v-if="permission.subject_edit"
+ @click="questionBankHandleAdd(row)"
+ >编辑
+ </el-button>
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-delete"
+ v-if="permission.subject_delete"
+ @click="questionBankHandleDel(row)"
+ >删除
+ </el-button>
+ </template>
+ </avue-crud>
- <el-dialog
- title="题库导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px"
- >
- <avue-form
- :option="excelOption"
- v-model="excelForm"
- :upload-after="uploadAfter"
- >
- <template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
- 点击下载<i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog>
- </div>
- </el-card>
- </el-col>
- </el-row>
+ <el-dialog
+ title="题库导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
+ >
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
+ </avue-form>
+ </el-dialog>
<addsubject ref="addsubject" v-on:refreshPage="refreshPage"></addsubject>
- </div>
+ </basic-container>
</template>
<script>
import { getList, remove } from "@/api/examapi/subject";
import addsubject from "./addsubject.vue";
-import { mapGetters,mapState } from "vuex";
+import { mapGetters, mapState } from "vuex";
import Qs from "qs";
import { getToken } from "@/util/auth";
export default {
components: {
- addsubject,
+ addsubject
},
data() {
return {
@@ -134,18 +122,18 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/examSubjectChoices/import-examSubject",
+ action: "/api/examSubjectChoices/import-examSubject"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
questionBankOption: {
// 操作栏多余按钮去除
@@ -172,13 +160,14 @@
// 操作栏宽度
menuWidth: 226,
...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.searchOpen,
column: [
{
label: "题目名称",
prop: "subjectName",
searchSpan: 4,
search: true,
- slot: true,
+ slot: true
},
{
label: "题目类型",
@@ -189,61 +178,61 @@
dicData: [
{
label: "单选题",
- value: 0,
+ value: 0
},
{
label: "多选题",
- value: 1,
+ value: 1
},
{
label: "判断题",
- value: 2,
+ value: 2
},
{
label: "实操题",
- value: 3,
- },
+ value: 3
+ }
],
slot: true,
- width: 96,
+ width: 96
},
{
label: "题目分值",
prop: "score",
slot: true,
- width: 96,
+ width: 96
},
{
label: "参考答案",
prop: "answer",
slot: true,
- width: 96,
+ width: 96
},
{
label: "创建人",
prop: "creator",
slot: true,
- width: 96,
+ width: 96
},
{
label: "创建时间",
prop: "createDate",
slot: true,
- width: 130,
+ width: 130
},
{
label: "修改人",
prop: "modifier",
slot: true,
- width: 96,
+ width: 96
},
{
label: "修改时间",
prop: "modifyDate",
slot: true,
- width: 130,
- },
- ],
+ width: 130
+ }
+ ]
},
questionBankSearch: {},
questionBankLoading: true,
@@ -252,13 +241,15 @@
pageSize: 10,
currentPage: 1,
total: 16,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
questionBankQuery: {},
- questionBankSelectionList: [],
+ questionBankSelectionList: []
};
},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
computed: {
...mapGetters(["userInfo", "permission"]),
permissionList() {
@@ -267,20 +258,20 @@
viewBtn: this.vaildData(this.permission.subject_view, false),
delBtn: this.vaildData(this.permission.subject_delete, false),
editBtn: this.vaildData(this.permission.subject_edit, false),
- excelBtn: this.vaildData(this.permission.subject_report, false),
+ excelBtn: this.vaildData(this.permission.subject_report, false)
};
},
ids() {
let ids = [];
- this.questionBankSelectionList.forEach((ele) => {
+ this.questionBankSelectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
methods: {
//触发页面刷新
- refreshPage(){
+ refreshPage() {
this.questionBankOnLoad(this.questionBankPage);
},
questionBankHandleAdd(row) {
@@ -293,11 +284,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.questionBankPage.total = data.total;
this.questionBankData = data.records;
this.questionBankLoading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.questionBankSelectionClear();
});
},
@@ -329,7 +321,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -338,7 +330,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -351,7 +343,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -360,7 +352,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.questionBankCrud.toggleSelection();
});
@@ -371,16 +363,24 @@
this.$confirm("是否导出清册数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
- window.open(`/api/apply/export-apply?examId=${this.$route.query.id}&${this.website.tokenHeader}=${getToken()}`);
+ window.open(
+ `/api/apply/export-apply?examId=${this.$route.query.id}&${
+ this.website.tokenHeader
+ }=${getToken()}`
+ );
});
},
handleImport() {
this.excelBox = true;
},
handleTemplate() {
- window.open(`/api/examSubjectChoices/export-template?${this.website.tokenHeader}=${getToken()}`);
+ window.open(
+ `/api/examSubjectChoices/export-template?${
+ this.website.tokenHeader
+ }=${getToken()}`
+ );
},
uploadAfter(res, done, loading, column) {
window.console.log(column);
@@ -390,10 +390,9 @@
},
refreshChange() {
this.questionBankOnLoad(this.page, this.query);
- },
- },
+ }
+ }
};
</script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/licenseApproval/branchOffice.vue b/src/views/licenseApproval/branchOffice.vue
index fde3670..26918a2 100644
--- a/src/views/licenseApproval/branchOffice.vue
+++ b/src/views/licenseApproval/branchOffice.vue
@@ -1,92 +1,85 @@
-/*
- * @Author: liu
- * @Date: 2021-08-26 17:00:55
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-23 14:41:23
- */
-
+/* * @Author: liu * @Date: 2021-08-26 17:00:55 * @Last Modified by: liu * @Last
+Modified time: 2021-11-23 14:41:23 */
<template>
- <div>
- <basic-container
- :class="[
- 'permit',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'permit',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ :row-style="rowStyle"
>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crud"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- :row-style="rowStyle"
- >
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- icon="el-icon-delete"
- plain
- v-if="permission.permit_delete"
- @click="handleDelete"
- >删 除
- </el-button>
- </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- icon="icon-zhengjian"
- :size="size"
- :type="type"
- class="zhengJian-icon"
- @click.stop="handleCredentials(row)"
- >附件</el-button
- >
- <el-button
- icon="el-icon-edit"
- :size="size"
- :type="type"
- v-if="row.type == '2' && userData == '0'"
- @click.stop="rowDel(row)"
- >备案审批
- </el-button>
- <el-button
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="viewLicense(row)"
- v-if="row.type == '0'"
- >打印备案证
- </el-button>
- </template>
- <template class="tdtype" slot-scope="{ row }" slot="type">
- <el-tag class="dtype">
- {{
- row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审批"
- }}
- <i class="gz" v-if="row.type == '2'"></i>
- <!-- 黄色 -->
- <i class="yj" v-if="row.type == '1'"></i>
- <!-- 红色 -->
- <i class="zc" v-if="row.type == '0'"></i>
- <!-- 绿色 -->
- </el-tag>
- </template>
- </avue-crud>
- </basic-container>
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ v-if="permission.permit_delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ </template>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="icon-zhengjian"
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ @click.stop="handleCredentials(row)"
+ >附件</el-button
+ >
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ v-if="row.type == '2' && userData == '0'"
+ @click.stop="rowDel(row)"
+ >备案审批
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ @click.stop="viewLicense(row)"
+ v-if="row.type == '0'"
+ >打印备案证
+ </el-button>
+ </template>
+ <template class="tdtype" slot-scope="{ row }" slot="type">
+ <el-tag class="dtype">
+ {{ row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审批" }}
+ <i class="gz" v-if="row.type == '2'"></i>
+ <!-- 黄色 -->
+ <i class="yj" v-if="row.type == '1'"></i>
+ <!-- 红色 -->
+ <i class="zc" v-if="row.type == '0'"></i>
+ <!-- 绿色 -->
+ </el-tag>
+ </template>
+ </avue-crud>
<div
v-if="dialogVisible"
@@ -163,7 +156,7 @@
</div>
</div>
</el-dialog>
- </div>
+ </basic-container>
</template>
<script>
@@ -172,7 +165,7 @@
getDetail,
add,
update,
- remove,
+ remove
} from "@/api/licenseApproval/record";
import { mapGetters } from "vuex";
import { column } from "./column";
@@ -187,7 +180,7 @@
dialogVisible: false, //许可证抽屉
licenceData: {
row: {},
- chiden: {},
+ chiden: {}
},
textareaShenpi: "",
@@ -198,7 +191,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -220,10 +213,10 @@
selection: true,
dialogClickModal: false,
column: column,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
data: [],
- userData: "",
+ userData: ""
};
},
computed: {
@@ -233,20 +226,20 @@
addBtn: this.vaildData(this.permission.permit_add, false),
viewBtn: this.vaildData(this.permission.permit_view, true),
delBtn: this.vaildData(this.permission.permit_delete, false),
- editBtn: this.vaildData(this.permission.permit_edit, false),
+ editBtn: this.vaildData(this.permission.permit_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
- // mounted() {
- // console.log(this.userInfo.dept_id);
- // },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
changeuserData() {
// console.log(this.userInfo, "userDatauserDatauserData");
@@ -281,7 +274,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "2" },
+ query: { deptid: row.cardid, type: "2" }
// params: { row: row.identificationnumber },
});
},
@@ -292,11 +285,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
window.console.log(error);
}
@@ -308,11 +301,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
console.log(error);
}
@@ -331,7 +324,7 @@
this.textareaShenpi = "";
this.$message({
type: "success",
- message: "审核通过!",
+ message: "审核通过!"
});
},
subcc() {
@@ -342,7 +335,7 @@
this.textareaShenpi = "";
this.$message({
type: "success",
- message: "审核不通过!",
+ message: "审核不通过!"
});
},
@@ -374,7 +367,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -383,14 +376,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -434,11 +427,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -446,17 +440,17 @@
if (row.dtype != null && row.dtype != "") {
if (row.dtype == "2") {
return {
- color: "#F34A4A",
+ color: "#F34A4A"
};
}
if (row.dtype == "1") {
return {
- color: "#F48F57",
+ color: "#F48F57"
};
}
}
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/licenseApproval/cancellationOfFiling.vue b/src/views/licenseApproval/cancellationOfFiling.vue
index f6ada44..6fb4d03 100644
--- a/src/views/licenseApproval/cancellationOfFiling.vue
+++ b/src/views/licenseApproval/cancellationOfFiling.vue
@@ -1,84 +1,77 @@
-/*
- * @Author: liu
- * @Date: 2021-08-26 17:00:04
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-05 15:24:32
- */
-
+/* * @Author: liu * @Date: 2021-08-26 17:00:04 * @Last Modified by: liu * @Last
+Modified time: 2021-11-05 15:24:32 */
<template>
- <div>
- <basic-container
- :class="[
- 'permit',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'permit',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ :row-style="rowStyle"
>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crud"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- :row-style="rowStyle"
- >
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- icon="el-icon-delete"
- plain
- v-if="permission.permit_delete"
- @click="handleDelete"
- >删 除
- </el-button>
- </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- icon="icon-zhengjian"
- :size="size"
- :type="type"
- class="zhengJian-icon"
- @click.stop="handleCredentials(row)"
- >附件
- </el-button>
- <el-button
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="rowDel(row)"
- v-if="row.type == '2' && userData == '0'"
- >撤销备案审批
- </el-button>
- </template>
- <template class="tdtype" slot-scope="{ row }" slot="type">
- <el-tag class="dtype">
- {{
- row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
- }}
- <i class="gz" v-if="row.type == '2'"></i>
- <!-- 黄色 -->
- <i class="yj" v-if="row.type == '1'"></i>
- <!-- 红色 -->
- <i class="zc" v-if="row.type == '0'"></i>
- <!-- 绿色 -->
- </el-tag>
- </template>
- </avue-crud>
- </basic-container>
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ v-if="permission.permit_delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ </template>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="icon-zhengjian"
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ @click.stop="handleCredentials(row)"
+ >附件
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ @click.stop="rowDel(row)"
+ v-if="row.type == '2' && userData == '0'"
+ >撤销备案审批
+ </el-button>
+ </template>
+ <template class="tdtype" slot-scope="{ row }" slot="type">
+ <el-tag class="dtype">
+ {{ row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核" }}
+ <i class="gz" v-if="row.type == '2'"></i>
+ <!-- 黄色 -->
+ <i class="yj" v-if="row.type == '1'"></i>
+ <!-- 红色 -->
+ <i class="zc" v-if="row.type == '0'"></i>
+ <!-- 绿色 -->
+ </el-tag>
+ </template>
+ </avue-crud>
<el-dialog
title=""
@@ -102,7 +95,7 @@
</div>
</div>
</el-dialog>
- </div>
+ </basic-container>
</template>
<script>
@@ -111,7 +104,7 @@
getDetail,
add,
update,
- remove,
+ remove
} from "@/api/licenseApproval/revoke";
import { mapGetters } from "vuex";
import { column } from "./column";
@@ -126,7 +119,7 @@
dialogVisible: false, //许可证抽屉
licenceData: {
row: {},
- chiden: {},
+ chiden: {}
},
textareaShenpi: "",
@@ -137,7 +130,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -159,10 +152,10 @@
selection: true,
dialogClickModal: false,
column: column,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
data: [],
- userData: "",
+ userData: ""
};
},
computed: {
@@ -172,20 +165,20 @@
addBtn: this.vaildData(this.permission.permit_add, false),
viewBtn: this.vaildData(this.permission.permit_view, true),
delBtn: this.vaildData(this.permission.permit_delete, false),
- editBtn: this.vaildData(this.permission.permit_edit, false),
+ editBtn: this.vaildData(this.permission.permit_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
- // mounted() {
- // console.log(this.userInfo.dept_id);
- // },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
changeuserData() {
// console.log(this.userInfo, "userDatauserDatauserData");
@@ -219,7 +212,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "4" },
+ query: { deptid: row.cardid, type: "4" }
// params: { row: row.identificationnumber },
});
},
@@ -230,11 +223,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
window.console.log(error);
}
@@ -246,11 +239,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
console.log(error);
}
@@ -301,7 +294,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -310,14 +303,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -359,11 +352,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -371,17 +365,17 @@
if (row.dtype != null && row.dtype != "") {
if (row.dtype == "2") {
return {
- color: "#F34A4A",
+ color: "#F34A4A"
};
}
if (row.dtype == "1") {
return {
- color: "#F48F57",
+ color: "#F48F57"
};
}
}
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/licenseApproval/crossRegion.vue b/src/views/licenseApproval/crossRegion.vue
index d6526b9..efdd4f5 100644
--- a/src/views/licenseApproval/crossRegion.vue
+++ b/src/views/licenseApproval/crossRegion.vue
@@ -1,92 +1,85 @@
-/*
- * @Author:liu
- * @Date: 2021-08-26 16:59:35
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-05 14:51:52
- */
-
+/* * @Author:liu * @Date: 2021-08-26 16:59:35 * @Last Modified by: liu * @Last
+Modified time: 2021-11-05 14:51:52 */
<template>
- <div>
- <basic-container
- :class="[
- 'permit',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'permit',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ :row-style="rowStyle"
>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crud"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- :row-style="rowStyle"
- >
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- icon="el-icon-delete"
- plain
- v-if="permission.permit_delete"
- @click="handleDelete"
- >删 除
- </el-button>
- </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- icon="icon-zhengjian"
- :size="size"
- :type="type"
- class="zhengJian-icon"
- @click.stop="handleCredentials(row)"
- >附件
- </el-button>
- <el-button
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="rowDel(row)"
- v-if="row.type == '2' && userData == '0'"
- >备案审批
- </el-button>
- <el-button
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="viewLicense(row)"
- v-if="row.type == '0'"
- >打印备案证
- </el-button>
- </template>
- <template class="tdtype" slot-scope="{ row }" slot="type">
- <el-tag class="dtype">
- {{
- row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
- }}
- <i class="gz" v-if="row.type == '2'"></i>
- <!-- 黄色 -->
- <i class="yj" v-if="row.type == '1'"></i>
- <!-- 红色 -->
- <i class="zc" v-if="row.type == '0'"></i>
- <!-- 绿色 -->
- </el-tag>
- </template>
- </avue-crud>
- </basic-container>
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ v-if="permission.permit_delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ </template>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="icon-zhengjian"
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ @click.stop="handleCredentials(row)"
+ >附件
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ @click.stop="rowDel(row)"
+ v-if="row.type == '2' && userData == '0'"
+ >备案审批
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ @click.stop="viewLicense(row)"
+ v-if="row.type == '0'"
+ >打印备案证
+ </el-button>
+ </template>
+ <template class="tdtype" slot-scope="{ row }" slot="type">
+ <el-tag class="dtype">
+ {{ row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核" }}
+ <i class="gz" v-if="row.type == '2'"></i>
+ <!-- 黄色 -->
+ <i class="yj" v-if="row.type == '1'"></i>
+ <!-- 红色 -->
+ <i class="zc" v-if="row.type == '0'"></i>
+ <!-- 绿色 -->
+ </el-tag>
+ </template>
+ </avue-crud>
<div
v-if="dialogVisible"
class="dialogVisibles"
@@ -161,7 +154,7 @@
</div>
</div>
</el-dialog>
- </div>
+ </basic-container>
</template>
<script>
@@ -170,7 +163,7 @@
getDetail,
add,
update,
- remove,
+ remove
} from "@/api/licenseApproval/recordk";
import { mapGetters } from "vuex";
import { column } from "./column";
@@ -185,7 +178,7 @@
dialogVisible: false, //许可证抽屉
licenceData: {
row: {},
- chiden: {},
+ chiden: {}
},
textareaShenpi: "",
@@ -196,7 +189,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -218,10 +211,10 @@
selection: true,
dialogClickModal: false,
column: column,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
data: [],
- userData: "",
+ userData: ""
};
},
computed: {
@@ -231,20 +224,20 @@
addBtn: this.vaildData(this.permission.permit_add, false),
viewBtn: this.vaildData(this.permission.permit_view, true),
delBtn: this.vaildData(this.permission.permit_delete, false),
- editBtn: this.vaildData(this.permission.permit_edit, false),
+ editBtn: this.vaildData(this.permission.permit_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
- // mounted() {
- // console.log(this.userInfo.dept_id);
- // },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
changeuserData() {
// console.log(this.userInfo, "userDatauserDatauserData");
@@ -278,7 +271,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "5" },
+ query: { deptid: row.cardid, type: "5" }
// params: { row: row.identificationnumber },
});
},
@@ -289,11 +282,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
window.console.log(error);
}
@@ -305,11 +298,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
console.log(error);
}
@@ -362,7 +355,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -371,14 +364,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -420,11 +413,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -432,17 +426,17 @@
if (row.dtype != null && row.dtype != "") {
if (row.dtype == "2") {
return {
- color: "#F34A4A",
+ color: "#F34A4A"
};
}
if (row.dtype == "1") {
return {
- color: "#F48F57",
+ color: "#F48F57"
};
}
}
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/licenseApproval/securityGuard.vue b/src/views/licenseApproval/securityGuard.vue
index 3a4baaa..7e9c6fe 100644
--- a/src/views/licenseApproval/securityGuard.vue
+++ b/src/views/licenseApproval/securityGuard.vue
@@ -1,69 +1,65 @@
-/*
- * @Author: liu
- * @Date: 2021-08-26 16:57:58
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-09 11:16:14
- */
-
+/* * @Author: liu * @Date: 2021-08-26 16:57:58 * @Last Modified by: liu * @Last
+Modified time: 2021-11-09 11:16:14 */
<template>
- <div>
- <basic-container
- :class="[
- 'permit',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'permit',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ :row-style="rowStyle"
>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crud"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- :row-style="rowStyle"
- >
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- icon="el-icon-delete"
- plain
- v-if="permission.permit_delete"
- @click="handleDelete"
- >删 除
- </el-button>
- </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- icon="icon-zhengjian"
- :size="size"
- :type="type"
- class="zhengJian-icon"
- @click.stop="handleCredentials(row)"
- >附件</el-button
- >
- <el-button
- icon="el-icon-edit"
- :size="size"
- :type="type"
- v-if="row.stateOur == '0'"
- @click.stop="rowDel(row)"
- >备案审批
- </el-button>
- <!-- <el-button
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ v-if="permission.permit_delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ </template>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="icon-zhengjian"
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ @click.stop="handleCredentials(row)"
+ >附件</el-button
+ >
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ v-if="row.stateOur == '0'"
+ @click.stop="rowDel(row)"
+ >备案审批
+ </el-button>
+ <!-- <el-button
icon="el-icon-edit"
:size="size"
:type="type"
@@ -78,46 +74,45 @@
@click.stop="rowSee(row)"
>审批查询
</el-button> -->
- <el-button
- icon="el-icon-brush"
- :size="size"
- :type="type"
- @click.stop="viewLicense(row)"
- v-if="
- row.papprove == '1' && row.xapprove == '1' && row.sapprove == '1'
- "
- >打印备案证
- </el-button>
- <el-button
- icon="el-icon-brush"
- :size="size"
- :type="type"
- v-if="
- row.papprove == '1' && row.xapprove == '1' && row.sapprove == '1'
- "
- @click.stop="viewLicensehuizhi(row)"
- >回执打印
- </el-button>
- </template>
- <template class="tdtype" slot-scope="{ row }" slot="type">
- <el-tag class="dtype">
- {{
- row.stateOur == "1"
- ? "通过"
- : row.stateOur == "2"
- ? "不通过"
- : "待审核"
- }}
- <i class="gz" v-if="row.type == '2'"></i>
- <!-- 黄色 -->
- <i class="yj" v-if="row.type == '1'"></i>
- <!-- 红色 -->
- <i class="zc" v-if="row.type == '0'"></i>
- <!-- 绿色 -->
- </el-tag>
- </template>
- </avue-crud>
- </basic-container>
+ <el-button
+ icon="el-icon-brush"
+ :size="size"
+ :type="type"
+ @click.stop="viewLicense(row)"
+ v-if="
+ row.papprove == '1' && row.xapprove == '1' && row.sapprove == '1'
+ "
+ >打印备案证
+ </el-button>
+ <el-button
+ icon="el-icon-brush"
+ :size="size"
+ :type="type"
+ v-if="
+ row.papprove == '1' && row.xapprove == '1' && row.sapprove == '1'
+ "
+ @click.stop="viewLicensehuizhi(row)"
+ >回执打印
+ </el-button>
+ </template>
+ <template class="tdtype" slot-scope="{ row }" slot="type">
+ <el-tag class="dtype">
+ {{
+ row.stateOur == "1"
+ ? "通过"
+ : row.stateOur == "2"
+ ? "不通过"
+ : "待审核"
+ }}
+ <i class="gz" v-if="row.type == '2'"></i>
+ <!-- 黄色 -->
+ <i class="yj" v-if="row.type == '1'"></i>
+ <!-- 红色 -->
+ <i class="zc" v-if="row.type == '0'"></i>
+ <!-- 绿色 -->
+ </el-tag>
+ </template>
+ </avue-crud>
<div
v-if="dialogVisible"
class="dialogVisibles"
@@ -248,7 +243,7 @@
<div><span>审批意见：</span> {{ stateText }}</div>
</div>
</el-dialog>
- </div>
+ </basic-container>
</template>
<script>
@@ -257,7 +252,7 @@
getDetail,
add,
update,
- remove,
+ remove
} from "@/api/licenseApproval/record";
import { mapGetters } from "vuex";
import { column } from "./column";
@@ -274,7 +269,7 @@
dialogVisible: false, //许可证抽屉
licenceData: {
row: {},
- chiden: {},
+ chiden: {}
},
textareaShenpi: "",
@@ -285,7 +280,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -307,7 +302,7 @@
selection: true,
dialogClickModal: false,
column: column,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
data: [],
@@ -316,7 +311,7 @@
stateText: "",
dialogVisibleccsee: false,
- userData: "",
+ userData: ""
};
},
computed: {
@@ -326,20 +321,20 @@
addBtn: this.vaildData(this.permission.permit_add, false),
viewBtn: this.vaildData(this.permission.permit_view, true),
delBtn: this.vaildData(this.permission.permit_delete, false),
- editBtn: this.vaildData(this.permission.permit_edit, false),
+ editBtn: this.vaildData(this.permission.permit_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
- // mounted() {
- // console.log(this.userInfo.dept_id);
- // },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
Printhuizhi() {
this.$Print(this.$refs.licencehuizhi);
@@ -353,7 +348,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "3" },
+ query: { deptid: row.cardid, type: "3" }
// params: { row: row.identificationnumber },
});
},
@@ -364,11 +359,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
window.console.log(error);
}
@@ -380,11 +375,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
console.log(error);
}
@@ -444,11 +439,11 @@
}
// console.log(this.xukezData);
// return;
- update(this.xukezData).then((res) => {
+ update(this.xukezData).then(res => {
console.log(res);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.refreshChange();
this.textareaShenpi = "";
@@ -488,7 +483,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -497,14 +492,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -545,12 +540,12 @@
this.user_name = "派";
} else if (name == "县局管理员") {
d = {
- papprove: "1",
+ papprove: "1"
};
this.user_name = "县";
} else if (name == "市局管理员") {
d = {
- xapprove: "1",
+ xapprove: "1"
};
this.user_name = "市";
}
@@ -592,7 +587,7 @@
gonganj == "派出所管理员" ? "2" : gonganj == "县局管理员" ? "1" : "0";
params = {
...params,
- ...this.getFenji(gonganj),
+ ...this.getFenji(gonganj)
};
console.log(params, "params");
params["jurisdiction"] = this.userInfo.jurisdiction;
@@ -603,7 +598,7 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
@@ -624,6 +619,7 @@
}
console.log(this.data);
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -631,17 +627,17 @@
if (row.dtype != null && row.dtype != "") {
if (row.dtype == "2") {
return {
- color: "#F34A4A",
+ color: "#F34A4A"
};
}
if (row.dtype == "1") {
return {
- color: "#F48F57",
+ color: "#F48F57"
};
}
}
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/licenseApproval/securityPermit.vue b/src/views/licenseApproval/securityPermit.vue
index dbdfe67..785503b 100644
--- a/src/views/licenseApproval/securityPermit.vue
+++ b/src/views/licenseApproval/securityPermit.vue
@@ -1,92 +1,85 @@
-
-/*
- * @Author: liu
- * @Date: 2021-08-26 16:22:20
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-05 14:52:21
- */
+/* * @Author: liu * @Date: 2021-08-26 16:22:20 * @Last Modified by: liu * @Last
+Modified time: 2021-11-05 14:52:21 */
<template>
- <div>
- <basic-container
- :class="[
- 'permit',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'permit',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ :row-style="rowStyle"
>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crud"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- :row-style="rowStyle"
- >
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- icon="el-icon-delete"
- plain
- v-if="permission.permit_delete"
- @click="handleDelete"
- >删 除
- </el-button>
- </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- icon="icon-zhengjian"
- :size="size"
- :type="type"
- class="zhengJian-icon"
- @click.stop="handleCredentials(row)"
- >附件
- </el-button>
- <el-button
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="rowDel(row)"
- v-if="row.type == '2' && userData == '0'"
- >许可审批
- </el-button>
- <el-button
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="viewLicense(row)"
- v-if="row.type == '0'"
- >打印许可证
- </el-button>
- </template>
- <template class="tdtype" slot-scope="{ row }" slot="type">
- <el-tag class="dtype">
- {{
- row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
- }}
- <i class="gz" v-if="row.type == '2'"></i>
- <!-- 黄色 -->
- <i class="yj" v-if="row.type == '1'"></i>
- <!-- 红色 -->
- <i class="zc" v-if="row.type == '0'"></i>
- <!-- 绿色 -->
- </el-tag>
- </template>
- </avue-crud>
- </basic-container>
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ v-if="permission.permit_delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ </template>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="icon-zhengjian"
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ @click.stop="handleCredentials(row)"
+ >附件
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ @click.stop="rowDel(row)"
+ v-if="row.type == '2' && userData == '0'"
+ >许可审批
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ @click.stop="viewLicense(row)"
+ v-if="row.type == '0'"
+ >打印许可证
+ </el-button>
+ </template>
+ <template class="tdtype" slot-scope="{ row }" slot="type">
+ <el-tag class="dtype">
+ {{ row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核" }}
+ <i class="gz" v-if="row.type == '2'"></i>
+ <!-- 黄色 -->
+ <i class="yj" v-if="row.type == '1'"></i>
+ <!-- 红色 -->
+ <i class="zc" v-if="row.type == '0'"></i>
+ <!-- 绿色 -->
+ </el-tag>
+ </template>
+ </avue-crud>
<!-- <el-dialog
:visible.sync="dialogVisible"
@@ -214,7 +207,7 @@
</div>
</div>
</el-dialog>
- </div>
+ </basic-container>
</template>
<script>
@@ -223,7 +216,7 @@
getDetail,
add,
update,
- remove,
+ remove
} from "@/api/licenseApproval/permit";
import { mapGetters } from "vuex";
import { column } from "./column";
@@ -238,7 +231,7 @@
dialogVisible: false, //许可证抽屉
licenceData: {
row: {},
- chiden: {},
+ chiden: {}
},
textareaShenpi: "",
@@ -249,7 +242,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -271,11 +264,11 @@
selection: true,
dialogClickModal: false,
column: column,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
data: [],
- userData: "",
+ userData: ""
};
},
computed: {
@@ -285,20 +278,20 @@
addBtn: this.vaildData(this.permission.permit_add, false),
viewBtn: this.vaildData(this.permission.permit_view, true),
delBtn: this.vaildData(this.permission.permit_delete, false),
- editBtn: this.vaildData(this.permission.permit_edit, false),
+ editBtn: this.vaildData(this.permission.permit_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
- // mounted() {
- // console.log(this.userInfo.dept_id);
- // },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
changeuserData() {
// console.log(this.userInfo, "userDatauserDatauserData");
@@ -333,7 +326,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "0" },
+ query: { deptid: row.cardid, type: "0" }
// params: { row: row.identificationnumber },
});
},
@@ -344,11 +337,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
window.console.log(error);
}
@@ -360,11 +353,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
console.log(error);
}
@@ -415,7 +408,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -424,7 +417,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
})
@@ -432,7 +425,7 @@
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -474,11 +467,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -486,17 +480,17 @@
if (row.dtype != null && row.dtype != "") {
if (row.dtype == "2") {
return {
- color: "#F34A4A",
+ color: "#F34A4A"
};
}
if (row.dtype == "1") {
return {
- color: "#F48F57",
+ color: "#F48F57"
};
}
}
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/licenseApproval/securityTraining.vue b/src/views/licenseApproval/securityTraining.vue
index 646a2ff..91d41d9 100644
--- a/src/views/licenseApproval/securityTraining.vue
+++ b/src/views/licenseApproval/securityTraining.vue
@@ -1,92 +1,85 @@
-/*
- * @Author: liu
- * @Date: 2021-08-26 16:55:25
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-05 14:52:22
- */
-
+/* * @Author: liu * @Date: 2021-08-26 16:55:25 * @Last Modified by: liu * @Last
+Modified time: 2021-11-05 14:52:22 */
<template>
- <div>
- <basic-container
- :class="[
- 'permit',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'permit',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :table-loading="loading"
+ :data="data"
+ :page.sync="page"
+ :permission="permissionList"
+ :before-open="beforeOpen"
+ v-model="form"
+ ref="crud"
+ @row-update="rowUpdate"
+ @row-save="rowSave"
+ @row-del="rowDel"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @selection-change="selectionChange"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ :row-style="rowStyle"
>
- <avue-crud
- :option="option"
- :table-loading="loading"
- :data="data"
- :page.sync="page"
- :permission="permissionList"
- :before-open="beforeOpen"
- v-model="form"
- ref="crud"
- @row-update="rowUpdate"
- @row-save="rowSave"
- @row-del="rowDel"
- @search-change="searchChange"
- @search-reset="searchReset"
- @selection-change="selectionChange"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- :row-style="rowStyle"
- >
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- icon="el-icon-delete"
- plain
- v-if="permission.permit_delete"
- @click="handleDelete"
- >删 除
- </el-button>
- </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- icon="icon-zhengjian"
- :size="size"
- :type="type"
- class="zhengJian-icon"
- @click.stop="handleCredentials(row)"
- >附件
- </el-button>
- <el-button
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="rowDel(row)"
- v-if="row.type == '2' && userData == '0'"
- >许可审批
- </el-button>
- <el-button
- icon="el-icon-edit"
- :size="size"
- :type="type"
- @click.stop="viewLicense(row)"
- v-if="row.type == '0'"
- >打印许可证
- </el-button>
- </template>
- <template class="tdtype" slot-scope="{ row }" slot="type">
- <el-tag class="dtype">
- {{
- row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核"
- }}
- <i class="gz" v-if="row.type == '2'"></i>
- <!-- 黄色 -->
- <i class="yj" v-if="row.type == '1'"></i>
- <!-- 红色 -->
- <i class="zc" v-if="row.type == '0'"></i>
- <!-- 绿色 -->
- </el-tag>
- </template>
- </avue-crud>
- </basic-container>
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ v-if="permission.permit_delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ </template>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="icon-zhengjian"
+ :size="size"
+ :type="type"
+ class="zhengJian-icon"
+ @click.stop="handleCredentials(row)"
+ >附件
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ @click.stop="rowDel(row)"
+ v-if="row.type == '2' && userData == '0'"
+ >许可审批
+ </el-button>
+ <el-button
+ icon="el-icon-edit"
+ :size="size"
+ :type="type"
+ @click.stop="viewLicense(row)"
+ v-if="row.type == '0'"
+ >打印许可证
+ </el-button>
+ </template>
+ <template class="tdtype" slot-scope="{ row }" slot="type">
+ <el-tag class="dtype">
+ {{ row.type == "0" ? "通过" : row.type == "1" ? "不通过" : "待审核" }}
+ <i class="gz" v-if="row.type == '2'"></i>
+ <!-- 黄色 -->
+ <i class="yj" v-if="row.type == '1'"></i>
+ <!-- 红色 -->
+ <i class="zc" v-if="row.type == '0'"></i>
+ <!-- 绿色 -->
+ </el-tag>
+ </template>
+ </avue-crud>
<!-- <el-dialog
:visible.sync="dialogVisible"
@@ -214,7 +207,7 @@
</div>
</div>
</el-dialog>
- </div>
+ </basic-container>
</template>
<script>
@@ -223,7 +216,7 @@
getDetail,
add,
update,
- remove,
+ remove
} from "@/api/licenseApproval/permit";
import { mapGetters } from "vuex";
import { column } from "./column";
@@ -238,7 +231,7 @@
dialogVisible: false, //许可证抽屉
licenceData: {
row: {},
- chiden: {},
+ chiden: {}
},
textareaShenpi: "",
@@ -249,7 +242,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -271,10 +264,10 @@
selection: true,
dialogClickModal: false,
column: column,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
data: [],
- userData: "",
+ userData: ""
};
},
computed: {
@@ -284,20 +277,20 @@
addBtn: this.vaildData(this.permission.permit_add, false),
viewBtn: this.vaildData(this.permission.permit_view, true),
delBtn: this.vaildData(this.permission.permit_delete, false),
- editBtn: this.vaildData(this.permission.permit_edit, false),
+ editBtn: this.vaildData(this.permission.permit_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
- // mounted() {
- // console.log(this.userInfo.dept_id);
- // },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
changeuserData() {
// console.log(this.userInfo, "userDatauserDatauserData");
@@ -331,7 +324,7 @@
path: "/attachOnce/index",
// redirect: { name: "foo" },
// query: { row: row },
- query: { deptid: row.cardid, type: "1" },
+ query: { deptid: row.cardid, type: "1" }
// params: { row: row.identificationnumber },
});
},
@@ -342,11 +335,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
window.console.log(error);
}
@@ -358,11 +351,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
console.log(error);
}
@@ -413,7 +406,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -422,14 +415,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -471,11 +464,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -483,17 +477,17 @@
if (row.dtype != null && row.dtype != "") {
if (row.dtype == "2") {
return {
- color: "#F34A4A",
+ color: "#F34A4A"
};
}
if (row.dtype == "1") {
return {
- color: "#F48F57",
+ color: "#F48F57"
};
}
}
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/ownerFeedback/owner.vue b/src/views/ownerFeedback/owner.vue
index 801e095..c1341d3 100644
--- a/src/views/ownerFeedback/owner.vue
+++ b/src/views/ownerFeedback/owner.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -54,7 +58,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -81,13 +85,13 @@
{
required: true,
message: "请输入服务单位",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "联系方式",
- prop: "companyContact",
+ prop: "companyContact"
},
{
label: "反馈时间",
@@ -105,9 +109,9 @@
{
required: true,
message: "请输入通知时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "反馈时间",
@@ -119,13 +123,13 @@
{
required: true,
message: "请输入反馈时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "反馈意见",
- prop: "opinion",
+ prop: "opinion"
},
{
label: "业主",
@@ -135,25 +139,25 @@
{
required: true,
message: "请输入反馈时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "业主联系方式",
- prop: "ownerContact",
+ prop: "ownerContact"
},
{
label: "备注",
- prop: "remarks",
+ prop: "remarks"
},
{
label: "处置结果",
- prop: "result",
- },
- ],
+ prop: "result"
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -163,16 +167,19 @@
addBtn: this.vaildData(this.permission.owner_add, false),
viewBtn: this.vaildData(this.permission.owner_view, false),
delBtn: this.vaildData(this.permission.owner_delete, false),
- editBtn: this.vaildData(this.permission.owner_edit, false),
+ editBtn: this.vaildData(this.permission.owner_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
rowSave(row, done, loading) {
@@ -181,11 +188,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -197,11 +204,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -211,7 +218,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -220,7 +227,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -249,7 +256,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -258,14 +265,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getNotice(this.form.id).then((res) => {
+ getNotice(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -283,29 +290,29 @@
onLoad(page, params = {}) {
const { releaseTimeRange } = this.query;
let values = {
- ...params,
+ ...params
};
if (releaseTimeRange) {
values = {
...params,
startTime: releaseTimeRange[0],
endTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
values.releaseTimeRange = null;
}
this.loading = true;
- getList(page.currentPage, page.pageSize, values).then((res) => {
+ getList(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/people/data.js b/src/views/people/data.js
index 4445de2..d548945 100644
--- a/src/views/people/data.js
+++ b/src/views/people/data.js
@@ -1,423 +1,451 @@
//保安员基本信息
-export var securityBaseInfoColumn = [{
+export var securityBaseInfoColumn = [
+ {
label: "",
labelWidth: "20",
- type: 'title',
+ type: "title",
prop: "title",
span: 24,
styles: {
- fontSize: '24px'
+ fontSize: "24px"
}
-},
-{
+ },
+ {
label: "企业名称",
prop: "deptName",
disabled: true,
- span: 24,
-},
-{
+ span: 24
+ },
+ {
label: "登录账号",
prop: "account",
disabled: true
-},
-{
+ },
+ {
label: "用户姓名",
prop: "realName",
- disabled: false,
-},
-{
+ disabled: false
+ },
+ {
label: "用户昵称",
prop: "name",
disabled: false
-},
-{
+ },
+ {
label: "手机号码",
prop: "phone",
disabled: false
-},
-{
+ },
+ {
label: "电子邮箱",
prop: "email",
disabled: false
-},
-{
+ },
+ {
label: "身份证号",
prop: "cardid",
disabled: false
-},
-{
+ },
+ {
label: "籍贯",
prop: "nativeplace",
disabled: false
-},
-{
+ },
+ {
label: "民族",
prop: "nation",
disabled: false
-},
-{
+ },
+ {
label: "是否持证",
prop: "hold",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
props: {
- label: "dictValue",
- value: "dictKey",
+ label: "dictValue",
+ value: "dictKey"
},
type: "select",
disabled: true
-},
-{
+ },
+ {
label: "保安员证编号",
prop: "securitynumber",
disabled: true
-},
-{
+ },
+ {
label: "所属辖区",
prop: "jurisdiction",
// multiple: true,
type: "tree",
dicUrl: "/api/jurisdiction/lazy-tree",
props: {
- label: "title",
- value: "id",
+ label: "title",
+ value: "id"
},
disabled: false
-},
-{
+ },
+ {
label: "最高学历",
prop: "education",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
props: {
- label: "dictValue",
- value: "dictKey"
+ label: "dictValue",
+ value: "dictKey"
},
dataType: "number",
slot: true,
disabled: false
-},
-{
+ },
+ {
label: "政治面貌",
prop: "politicaloutlook",
disabled: false
-},
-{
+ },
+ {
label: "身高",
prop: "height",
disabled: false
-},
-{
+ },
+ {
label: "联系地址",
prop: "address",
disabled: false
-},
-{
+ },
+ {
label: "户口所在地",
prop: "registered",
disabled: false
-},
-{
+ },
+ {
label: "入职时间",
prop: "rtime",
- type: 'date',
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
disabled: false
-},
-{
+ },
+ {
label: "用户性别",
prop: "sex",
type: "select",
- dicData: [{
+ dicData: [
+ {
label: "男",
value: 1
- },
- {
+ },
+ {
label: "女",
value: 2
- },
- {
+ },
+ {
label: "未知",
value: 3
- }
+ }
],
disabled: false
-},
- // {
- // label: "用户生日",
- // type: "date",
- // prop: "birthday",
- // disabled: true
- // }
+ }
+ // {
+ // label: "用户生日",
+ // type: "date",
+ // prop: "birthday",
+ // disabled: true
+ // }
+];
-
-]
-
-
-export var securityBaseInfoColumns = [{
+export var securityBaseInfoColumns = [
+ {
label: "所属保安单位",
prop: "tenantId",
type: "tree",
dicUrl: "/api/blade-system/tenant/select",
props: {
- label: "tenantName",
- value: "tenantId"
+ label: "tenantName",
+ value: "tenantId"
},
disabled: true,
- span: 24,
-},
-{
+ span: 24
+ },
+ {
label: "登录账号",
prop: "account",
disabled: true
-},
-{
+ },
+ {
label: "用户姓名",
prop: "realName",
- rules: [{
+ rules: [
+ {
required: true,
message: "请输入用户姓名",
trigger: "blur"
- }, {
+ },
+ {
min: 2,
max: 5,
- message: '姓名长度在2到5个字符'
- }]
-},
-{
+ message: "姓名长度在2到5个字符"
+ }
+ ]
+ },
+ {
label: "用户昵称",
prop: "name"
-},
-{
+ },
+ {
label: "手机号码",
prop: "phone",
overHidden: true,
- rules: [{
+ rules: [
+ {
required: true,
message: "请输入手机号",
trigger: "blur"
- }]
-},
-{
+ }
+ ]
+ },
+ {
label: "电子邮箱",
prop: "email",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "身份证号",
prop: "cardid",
hide: true,
overHidden: true,
- rules: [{
+ rules: [
+ {
required: true,
message: "请输入身份证号",
trigger: "blur"
- }]
-},
-{
+ }
+ ]
+ },
+ {
label: "籍贯",
prop: "nativeplace",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "民族",
prop: "nation",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "最高学历",
prop: "education",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
props: {
- label: "dictValue",
- value: "dictKey"
+ label: "dictValue",
+ value: "dictKey"
},
dataType: "number",
slot: true,
- rules: [{
+ rules: [
+ {
required: true,
message: "请选择学历",
trigger: "blur"
- }]
-},
-{
+ }
+ ]
+ },
+ {
label: "政治面貌",
prop: "politicaloutlook",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "身高",
prop: "height",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "联系地址",
prop: "address",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "户口所在地",
prop: "registered",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "入职时间",
prop: "rtime",
- type: 'date',
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
hide: true,
overHidden: true
-},
-{
+ },
+ {
label: "用户性别",
prop: "sex",
type: "select",
- dicData: [{
+ dicData: [
+ {
label: "男",
value: 1
- },
- {
+ },
+ {
label: "女",
value: 2
- },
- {
+ },
+ {
label: "未知",
value: 3
- }
+ }
],
hide: true
-},
-{
+ },
+ {
label: "用户生日",
type: "date",
prop: "birthday",
hide: true
-}
-]
-
+ }
+];
//从业记录
-export var practitionersColumn = [{
+export var practitionersColumn = [
+ {
label: "id",
prop: "id",
hide: true,
editDisplay: false,
addDisplay: false
-}, {
- label: '企业名称',
+ },
+ {
+ label: "企业名称",
prop: "companyname",
- formslot: true,
-}, {
- label: '部门',
+ formslot: true
+ },
+ {
+ label: "部门",
prop: "department",
- formslot: true,
-}, {
- label: '岗位',
+ formslot: true
+ },
+ {
+ label: "岗位",
prop: "post",
- formslot: true,
-}, {
- label: '岗位职责',
+ formslot: true
+ },
+ {
+ label: "岗位职责",
prop: "responsibilities",
- formslot: true,
-}, {
- label: '入职时间',
- type: 'date',
+ formslot: true
+ },
+ {
+ label: "入职时间",
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
prop: "entrytime",
- formslot: true,
-}, {
- label: '离职时间',
- type: 'date',
+ formslot: true
+ },
+ {
+ label: "离职时间",
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
prop: "departuretime",
- formslot: true,
-}, {
- label: '离职原因',
+ formslot: true
+ },
+ {
+ label: "离职原因",
prop: "leaving",
- formslot: true,
-}]
+ formslot: true
+ }
+];
-export var practitionersColumns = [{
+export var practitionersColumns = [
+ {
width: 200,
- label: '企业名称',
+ label: "企业名称",
prop: "companyname",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '部门',
+ label: "部门",
prop: "department",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '岗位',
+ label: "岗位",
prop: "post",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '岗位职责',
+ label: "岗位职责",
prop: "responsibilities",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '入职时间',
- type: 'date',
+ label: "入职时间",
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
prop: "entryTime",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '离职时间',
- type: 'date',
+ label: "离职时间",
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
prop: "departureTime",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '离职原因',
+ label: "离职原因",
prop: "leaving",
- formslot: true,
-}]
-
+ formslot: true
+ }
+];
//表现
-export var trackRecordColumn = [{
+export var trackRecordColumn = [
+ {
label: "id",
prop: "id",
hide: true,
editDisplay: false,
addDisplay: false
-}, {
- label: '时间',
- type: 'date',
+ },
+ {
+ label: "时间",
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
prop: "time",
- formslot: true,
-},
-// {
-// label: '工作态度',
-// prop: "workingattitude",
-// formslot: true,
-// },
-{
- label: '工作表现',
+ formslot: true
+ },
+ // {
+ // label: '工作态度',
+ // prop: "workingattitude",
+ // formslot: true,
+ // },
+ {
+ label: "工作表现",
prop: "achievements",
- formslot: true,
-}, {
- label: '表现评定',
+ formslot: true
+ },
+ {
+ label: "表现评定",
prop: "score",
type: "select",
// dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
@@ -425,40 +453,43 @@
// label: "dictValue",
// value: "dictKey"
// },
- dicData: [{
+ dicData: [
+ {
label: "优秀",
value: 0
- },
- {
+ },
+ {
label: "良好",
value: 1
- },
- {
+ },
+ {
label: "一般",
value: 2
- },
- {
+ },
+ {
label: "差",
value: 3
- },
+ }
],
dataType: "number",
slot: true,
- rules: [{
+ rules: [
+ {
required: true,
message: "请选择表现",
trigger: "blur"
- }]
-}
- // {
- // label: '服务公司',
- // prop: "departmentName",
- // formslot: true,
- // }
-]
+ }
+ ]
+ }
+ // {
+ // label: '服务公司',
+ // prop: "departmentName",
+ // formslot: true,
+ // }
+];
-
-export var securityFormPageColumn = [{
+export var securityFormPageColumn = [
+ {
label: "姓名",
prop: "realName",
search: true,
@@ -466,45 +497,47 @@
width: 60,
searchLabelWidth: 50,
display: false
-},
-{
+ },
+ {
label: "企业名称",
searchLabelWidth: "110",
// prop: "deptName",
prop: "deptId",
type: "tree",
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ dicUrl:
+ "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
- label: "title",
- value: "id",
+ label: "title",
+ value: "id"
},
slot: true,
searchSpan: 5,
display: false,
search: true,
minWidth: 260
-},
-{
+ },
+ {
label: "性别",
prop: "sex",
width: 55,
type: "select",
- dicData: [{
+ dicData: [
+ {
label: "男",
- value: 1,
- },
- {
+ value: 1
+ },
+ {
label: "女",
- value: 2,
- },
- {
+ value: 2
+ },
+ {
label: "未知",
- value: 3,
- },
+ value: 3
+ }
],
display: false
-},
-{
+ },
+ {
label: "身份证号码",
prop: "cardid",
search: true,
@@ -512,68 +545,70 @@
searchSpan: 5,
minWidth: 140,
display: false
-},
+ },
-{
+ {
label: "籍贯",
prop: "nativeplace",
hide: true,
display: false
-},
-{
+ },
+ {
label: "民族",
prop: "nation",
hide: true,
width: 55,
display: false
-},
+ },
-{
+ {
label: "出生日期",
prop: "birthday",
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
display: false,
- hide: true,
-},
-{
+ hide: true
+ },
+ {
label: "年龄",
prop: "age",
width: 55,
display: false
-},
-{
+ },
+ {
label: "学历",
prop: "education",
display: false,
width: 90,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
props: {
- label: "dictValue",
- value: "dictKey"
+ label: "dictValue",
+ value: "dictKey"
},
type: "select",
// hide: true,
- rules: [{
+ rules: [
+ {
required: true,
message: "请选择学历",
trigger: "blur"
- }],
-},
-{
+ }
+ ]
+ },
+ {
label: "联系电话",
prop: "phone",
minWidth: 100,
display: false
-},
-{
+ },
+ {
label: "健康状态",
prop: "healstats",
hide: true,
display: false
-},
-{
+ },
+ {
label: "保安证编号",
prop: "securitynumber",
search: true,
@@ -581,46 +616,49 @@
minWidth: 105,
searchSpan: 4,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
// hide: true,
-},
-{
+ },
+ {
label: "入职时间",
prop: "rtime",
hide: true,
display: false
-},
-// {
-// label: "是否派遣",
-// prop: "dispatch",
-// // hide: true,
-// type: 'select',
-// // display: false,
-// dicData: [
-// {
-// label: '未派遣',
-// value: 1
-// }, {
-// label: '已派遣',
-// value: 0
-// }
-// ]
-// },
-{
- label: '是否派遣',
- prop: 'dispatch',
- type: 'select',
+ },
+ // {
+ // label: "是否派遣",
+ // prop: "dispatch",
+ // // hide: true,
+ // type: 'select',
+ // // display: false,
+ // dicData: [
+ // {
+ // label: '未派遣',
+ // value: 1
+ // }, {
+ // label: '已派遣',
+ // value: 0
+ // }
+ // ]
+ // },
+ {
+ label: "是否派遣",
+ prop: "dispatch",
+ type: "select",
editDisplay: false,
addDisplay: false,
- dicData: [{
- label: '未派遣',
- value: '1'
- }, {
- label: '已派遣',
- value: '0'
- }]
-},
-{
+ dicData: [
+ {
+ label: "未派遣",
+ value: "1"
+ },
+ {
+ label: "已派遣",
+ value: "0"
+ }
+ ]
+ },
+ {
label: "是否持证",
prop: "hold",
slot: true,
@@ -630,44 +668,46 @@
display: false,
dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
props: {
- label: "dictValue",
- value: "dictKey"
+ label: "dictValue",
+ value: "dictKey"
},
type: "select",
- rules: [{
+ rules: [
+ {
required: true,
message: "请选择",
trigger: "blur"
- }],
-},
+ }
+ ]
+ },
-// {
-// label: "入职时间",
-// prop: "rtime",
-// type: "datetime",
-// format: "yyyy-MM-dd",
-// valueFormat: "yyyy-MM-dd",
-// searchRange: true,
-// searchSpan: 6,
-// hide: true,
-// addDisplay: false,
-// editDisplay: false,
-// viewDisplay: false,
-// search: true,
-// rules: [{
-// required: true,
-// message: "请输入时间",
-// trigger: "blur"
-// }]
-// },
-{
+ // {
+ // label: "入职时间",
+ // prop: "rtime",
+ // type: "datetime",
+ // format: "yyyy-MM-dd",
+ // valueFormat: "yyyy-MM-dd",
+ // searchRange: true,
+ // searchSpan: 6,
+ // hide: true,
+ // addDisplay: false,
+ // editDisplay: false,
+ // viewDisplay: false,
+ // search: true,
+ // rules: [{
+ // required: true,
+ // message: "请输入时间",
+ // trigger: "blur"
+ // }]
+ // },
+ {
label: "在职状态",
prop: "status",
type: "select",
dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
props: {
- label: "dictValue",
- value: "dictKey"
+ label: "dictValue",
+ value: "dictKey"
},
dataType: "number",
searchValue: 1,
@@ -676,10 +716,12 @@
searchSpan: 3,
width: 80,
search: true,
- rules: [{
+ rules: [
+ {
required: true,
message: "请选择在职状态",
trigger: "blur"
- }]
-},
-]
\ No newline at end of file
+ }
+ ]
+ }
+];
diff --git a/src/views/people/expression.vue b/src/views/people/expression.vue
index dcc9738..4f8b0be 100644
--- a/src/views/people/expression.vue
+++ b/src/views/people/expression.vue
@@ -1,17 +1,15 @@
-/**
-*liu
-**/
-
-
+/** *liu **/
<template>
<basic-container
:class="[
'dispatchChildoperable',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option1"
:data="data1"
:page.sync="page1"
@@ -33,7 +31,7 @@
import {
securityBaseInfoColumn,
practitionersColumn,
- trackRecordColumn,
+ trackRecordColumn
} from "./data";
import { getUserPractitionersInfo } from "@/api/system/user";
import { mapGetters } from "vuex";
@@ -51,7 +49,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query1: {},
data1: [],
@@ -71,8 +69,8 @@
headerAlign: "center",
align: "center",
column: trackRecordColumn,
- ...this.$store.state.control.clearOtherBut,
- },
+ ...this.$store.state.control.clearOtherBut
+ }
};
},
computed: {
@@ -80,11 +78,11 @@
ids1() {
let ids1 = [];
- this.selectionList1.forEach((ele) => {
+ this.selectionList1.forEach(ele => {
ids1.push(ele.id);
});
return ids1.join(",");
- },
+ }
},
methods: {
sizeChange1(val) {
@@ -98,15 +96,15 @@
},
rowSave1(form, done, loading) {
adddata1(form).then(
- (res) => {
+ res => {
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -129,11 +127,11 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -143,7 +141,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(row.id);
@@ -152,7 +150,7 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -169,7 +167,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(this.ids1);
@@ -178,7 +176,7 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec1.toggleSelection();
});
@@ -215,18 +213,20 @@
params = {
...params,
- securityid: cardid,
+ securityid: cardid
};
- getpage(page1.currentPage, page1.pageSize, params).then((res2) => {
+ getpage(page1.currentPage, page1.pageSize, params).then(res2 => {
const data = res2.data.data;
this.page1.total = data.total;
this.data1 = data.records;
- console.log(this.data1, 1);
+ // console.log(this.data1, 1);
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading1 = false;
});
- },
+ }
},
mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
this.onLoad1(this.page1, this.query1);
//去掉缓存
// this.typeTABS = this.optionTABS.column[0];
@@ -261,7 +261,7 @@
// // console.log("no");
// this.obj0.name = " 未选择派遣单位";
// }
- },
+ }
};
</script>
diff --git a/src/views/people/job.vue b/src/views/people/job.vue
index 54419c6..8aa4dac 100644
--- a/src/views/people/job.vue
+++ b/src/views/people/job.vue
@@ -1,17 +1,15 @@
-/**
-*liu
-**/
-
-
+/** *liu **/
<template>
<basic-container
:class="[
'dispatchChildoperable',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option1"
:data="data1"
:page.sync="page1"
@@ -33,14 +31,14 @@
import {
securityBaseInfoColumn,
practitionersColumn,
- trackRecordColumn,
+ trackRecordColumn
} from "./data";
import {
addExperience,
updateExperience,
getUserDetails,
experienceRemove,
- getExperienceList,
+ getExperienceList
} from "@/api/experience/experience";
import { mapGetters } from "vuex";
import { add, update, getpage, remove } from "@/api/performance/performance";
@@ -57,7 +55,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query1: {},
data1: [],
@@ -77,8 +75,8 @@
headerAlign: "center",
align: "center",
column: practitionersColumn,
- ...this.$store.state.control.clearOtherBut,
- },
+ ...this.$store.state.control.clearOtherBut
+ }
};
},
computed: {
@@ -86,11 +84,11 @@
ids1() {
let ids1 = [];
- this.selectionList1.forEach((ele) => {
+ this.selectionList1.forEach(ele => {
ids1.push(ele.id);
});
return ids1.join(",");
- },
+ }
},
methods: {
sizeChange1(val) {
@@ -104,15 +102,15 @@
},
rowSave1(form, done, loading) {
adddata1(form).then(
- (res) => {
+ res => {
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -135,11 +133,11 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -149,7 +147,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(row.id);
@@ -158,7 +156,7 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -175,7 +173,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(this.ids1);
@@ -184,7 +182,7 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec1.toggleSelection();
});
@@ -221,20 +219,22 @@
params = {
...params,
- securityid: cardid,
+ securityid: cardid
};
getExperienceList(page1.currentPage, page1.pageSize, params).then(
- (res2) => {
+ res2 => {
const data = res2.data.data;
this.page1.total = data.total;
this.data1 = data.records;
console.log(this.data1, 1);
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading1 = false;
}
);
- },
+ }
},
mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
this.onLoad1(this.page1, this.query1);
//去掉缓存
// this.typeTABS = this.optionTABS.column[0];
@@ -269,7 +269,7 @@
// // console.log("no");
// this.obj0.name = " 未选择派遣单位";
// }
- },
+ }
};
</script>
diff --git a/src/views/recruitmentManagement/index.vue b/src/views/recruitmentManagement/index.vue
index e2ecf79..936ebc8 100644
--- a/src/views/recruitmentManagement/index.vue
+++ b/src/views/recruitmentManagement/index.vue
@@ -1,38 +1,38 @@
<template>
- <basic-container>
- <div
- :class="[
- 'recruitmentManagement',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'recruitmentManagement',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec"
+ @on-load="onLoad"
+ :table-loading="loading"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
>
- <avue-crud
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec"
- @on-load="onLoad"
- :table-loading="loading"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
- >
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete"
- >删 除
- </el-button>
- </template>
- </avue-crud>
- </div>
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ </template>
+ </avue-crud>
</basic-container>
</template>
@@ -42,7 +42,7 @@
getdata,
adddata,
update,
- remove,
+ remove
} from "@/api/recruitmentManagement/recruitmentManagement";
import { mapGetters } from "vuex";
@@ -55,7 +55,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query: {},
data: [],
@@ -71,9 +71,9 @@
align: "center",
selection: true,
column: column,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
- useifid: 266,
+ useifid: 266
};
},
created() {
@@ -100,11 +100,11 @@
...mapGetters(["userInfo"]),
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
methods: {
sizeChange(val) {
@@ -127,15 +127,15 @@
form["deptId"] = this.useifid;
}
adddata(form).then(
- (res) => {
+ res => {
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -161,11 +161,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -175,7 +175,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -184,7 +184,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -199,7 +199,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -208,7 +208,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec.toggleSelection();
});
@@ -230,23 +230,25 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
// console.log(res);
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading = false;
});
- },
+ }
},
mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
// this.Ourdata = data;
// this.getData();
// this.onLoad(this.page);
// var dept_id = JSON.parse(
// window.localStorage.getItem("saber-userInfo")
// ).content.dept_id;
- },
+ }
};
</script>
@@ -265,4 +267,4 @@
// .el-tag--light {
// padding: 0 !important;
// }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/resource/attach.vue b/src/views/resource/attach.vue
index de23d2f..8b8daf5 100644
--- a/src/views/resource/attach.vue
+++ b/src/views/resource/attach.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'hasButTwo',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -108,7 +110,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
attachBox: false,
selectionList: [],
@@ -133,9 +135,9 @@
{
required: true,
message: "请输入附件地址",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "附件域名",
@@ -145,9 +147,9 @@
{
required: true,
message: "请输入附件域名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "附件名称",
@@ -157,9 +159,9 @@
{
required: true,
message: "请输入附件名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "附件原名",
@@ -169,9 +171,9 @@
{
required: true,
message: "请输入附件原名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "附件拓展名",
@@ -180,9 +182,9 @@
{
required: true,
message: "请输入附件拓展名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "附件大小",
@@ -192,11 +194,11 @@
{
required: true,
message: "请输入附件大小",
- trigger: "blur",
- },
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
},
data: [],
attachForm: {},
@@ -212,18 +214,18 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
action:
"/api/blade-resource/oss/endpoint/put-file-attach?type=" +
type +
"&deptid=" +
- deptid,
- },
- ],
+ deptid
+ }
+ ]
},
imgSee: false,
- imgUrl: "",
+ imgUrl: ""
};
},
computed: {
@@ -233,18 +235,19 @@
addBtn: false,
editBtn: false,
viewBtn: false,
- delBtn: this.vaildData(this.permission.attach_delete, false),
+ delBtn: this.vaildData(this.permission.attach_delete, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
var flag = false,
i = 0,
ind = null;
@@ -278,7 +281,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -287,7 +290,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -299,7 +302,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -308,14 +311,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -355,11 +358,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -385,13 +389,12 @@
"webp",
"psd",
"svg",
- "tiff",
+ "tiff"
].indexOf(ext.toLowerCase()) == -1
);
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/resource/oss.vue b/src/views/resource/oss.vue
index 59e34e3..0835827 100644
--- a/src/views/resource/oss.vue
+++ b/src/views/resource/oss.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'hasButOne',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -84,7 +86,7 @@
add,
update,
remove,
- enable,
+ enable
} from "@/api/resource/oss";
import { mapGetters } from "vuex";
import func from "@/util/func";
@@ -100,7 +102,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -130,7 +132,7 @@
dicUrl: "/api/blade-system/dict/dictionary?code=oss",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
dataType: "number",
slot: true,
@@ -140,9 +142,9 @@
{
required: true,
message: "请选择分类",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "资源编号",
@@ -154,9 +156,9 @@
{
required: true,
message: "请输入资源编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "资源地址",
@@ -166,9 +168,9 @@
{
required: true,
message: "请输入资源地址",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "空间名",
@@ -179,9 +181,9 @@
{
required: true,
message: "请输入空间名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "accessKey",
@@ -194,9 +196,9 @@
{
required: true,
message: "请输入accessKey",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "secretKey",
@@ -208,23 +210,23 @@
{
required: true,
message: "请输入secretKey",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "appId",
prop: "appId",
span: 24,
hide: true,
- display: false,
+ display: false
},
{
label: "region",
prop: "region",
span: 24,
hide: true,
- display: false,
+ display: false
},
{
label: "是否启用",
@@ -235,19 +237,19 @@
slot: true,
addDisplay: false,
editDisplay: false,
- viewDisplay: false,
+ viewDisplay: false
},
{
label: "备注",
prop: "remark",
span: 24,
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
data: [],
debugForm: {
- code: "",
+ code: ""
},
debugOption: {
submitText: "提交",
@@ -256,7 +258,7 @@
label: "资源编号",
prop: "code",
disabled: true,
- span: 24,
+ span: 24
},
{
label: "上传背景",
@@ -266,18 +268,18 @@
action: "/api/blade-resource/oss/endpoint/put-file",
propsHttp: {
res: "data",
- url: "link",
+ url: "link"
},
- span: 24,
- },
- ],
- },
+ span: 24
+ }
+ ]
+ }
};
},
watch: {
"form.category"() {
const category = func.toInt(this.form.category);
- this.$refs.crud.option.column.filter((item) => {
+ this.$refs.crud.option.column.filter(item => {
if (item.prop === "appId") {
item.display = category === 4;
}
@@ -289,7 +291,7 @@
"debugForm.code"() {
const column = this.findObject(this.debugOption.column, "backgroundUrl");
column.action = `/api/blade-resource/oss/endpoint/put-file?code=${this.debugForm.code}`;
- },
+ }
},
computed: {
...mapGetters(["userInfo", "permission"]),
@@ -298,16 +300,19 @@
addBtn: this.vaildData(this.permission.oss_add),
viewBtn: this.vaildData(this.permission.oss_view),
delBtn: this.vaildData(this.permission.oss_delete),
- editBtn: this.vaildData(this.permission.oss_edit),
+ editBtn: this.vaildData(this.permission.oss_edit)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
rowSave(row, done, loading) {
@@ -316,11 +321,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -332,11 +337,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -346,7 +351,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -355,7 +360,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -380,7 +385,7 @@
this.$confirm("是否确定启用这条配置?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return enable(row.id);
@@ -389,7 +394,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
@@ -402,7 +407,7 @@
handleSubmit(form, done) {
this.$message({
type: "success",
- message: `获取到图片地址:[${form.backgroundUrl}]`,
+ message: `获取到图片地址:[${form.backgroundUrl}]`
});
done();
},
@@ -414,7 +419,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -423,14 +428,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -451,14 +456,15 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/securityAnalysis/child/assignment copy.vue b/src/views/securityAnalysis/child/assignment copy.vue
index 0a4e94e..89a93a0 100644
--- a/src/views/securityAnalysis/child/assignment copy.vue
+++ b/src/views/securityAnalysis/child/assignment copy.vue
@@ -1,38 +1,39 @@
<template>
- <basic-container>
- <div
- :class="[
- 'dispatchChildoperable',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'dispatchChildoperable',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option1"
+ :data="data1"
+ :page.sync="page1"
+ ref="crudrec1"
+ v-model="form1"
+ :table-loading="loading1"
+ :before-open="beforeOpen"
+ @row-save="rowSave1"
+ @search-change="searchChange1"
+ @search-reset="searchReset1"
+ @row-update="rowUpdate1"
+ @row-del="rowDel1"
+ @selection-change="selectionChange1"
+ @refresh-change="refreshChange1"
+ @on-load="onLoad1"
>
- <avue-crud
- :option="option1"
- :data="data1"
- :page.sync="page1"
- ref="crudrec1"
- v-model="form1"
- :table-loading="loading1"
- :before-open="beforeOpen"
- @row-save="rowSave1"
- @search-change="searchChange1"
- @search-reset="searchReset1"
- @row-update="rowUpdate1"
- @row-del="rowDel1"
- @selection-change="selectionChange1"
- @refresh-change="refreshChange1"
- >
- <template slot-scope="{ type, row }" slot="menu">
- <el-button
- icon="el-icon-check"
- size="small"
- :type="type"
- @click="openClick(row, page2)"
- >派遣轨迹</el-button
- >
- </template>
- </avue-crud>
- </div>
+ <template slot-scope="{ type, row }" slot="menu">
+ <el-button
+ icon="el-icon-check"
+ size="small"
+ :type="type"
+ @click="openClick(row, page2)"
+ >派遣轨迹</el-button
+ >
+ </template>
+ </avue-crud>
<el-dialog
title="提示"
:visible.sync="dialogVisible"
@@ -78,7 +79,7 @@
update1,
remove1,
getDispatcherUnitByDeptId,
- overDispatcher,
+ overDispatcher
} from "@/api/dispatch/dispatch";
import { update, getListByDeptId } from "@/api/system/user";
import { mapState } from "vuex";
@@ -100,7 +101,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
form1: {},
query1: {},
@@ -135,7 +136,7 @@
// searchSpan: 4,
minWidth: 210,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
},
{
label: "保安公司",
@@ -147,7 +148,7 @@
cascaderItem: ["userIds"],
props: {
label: "title",
- value: "id",
+ value: "id"
},
width: 180,
dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
@@ -155,9 +156,9 @@
{
required: true,
message: "请输入保安公司",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "派遣单位",
@@ -167,7 +168,7 @@
// dicUrl: "/api/dispatcherUnit/page-tree?deptId={{key}}",
props: {
label: "name",
- value: "id",
+ value: "id"
},
hide: true,
searchSpan: 4,
@@ -178,9 +179,9 @@
{
required: true,
message: "请输入派遣单位",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "保安员",
@@ -193,7 +194,7 @@
hide: true,
props: {
label: "realName",
- value: "id",
+ value: "id"
},
// dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
@@ -202,9 +203,9 @@
{
required: true,
message: "请选择保安",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "保安员",
@@ -225,9 +226,9 @@
{
required: true,
message: "请选择保安",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
@@ -241,9 +242,9 @@
{
required: true,
message: "请输入身份证",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -263,9 +264,9 @@
{
required: true,
message: "请输入派遣地址",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -284,9 +285,9 @@
{
required: true,
message: "请输入派遣时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// overHidden: true
},
{
@@ -301,9 +302,9 @@
{
required: true,
message: "请输入结束时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -326,11 +327,11 @@
{
required: true,
message: "请输入时间",
- trigger: "blur",
- },
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
},
loading2: true, //单个人派遣记录
vals: [],
@@ -339,7 +340,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
form2: {},
query2: {},
@@ -373,7 +374,7 @@
// searchSpan: 4,
minWidth: 210,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
},
{
label: "保安公司",
@@ -385,7 +386,7 @@
cascaderItem: ["userIds"],
props: {
label: "title",
- value: "id",
+ value: "id"
},
width: 180,
dicUrl: `/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697`,
@@ -393,9 +394,9 @@
{
required: true,
message: "请输入保安公司",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "派遣单位",
@@ -405,7 +406,7 @@
// dicUrl: "/api/dispatcherUnit/page-tree?deptId={{key}}",
props: {
label: "name",
- value: "id",
+ value: "id"
},
hide: true,
searchSpan: 4,
@@ -416,9 +417,9 @@
{
required: true,
message: "请输入派遣单位",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "保安员",
@@ -431,7 +432,7 @@
hide: true,
props: {
label: "realName",
- value: "id",
+ value: "id"
},
// dicUrl: `/api/blade-user/page-security-units?dispatch=1&deptId={{key}}`,
dicUrl: `/api/blade-user/page-security-units?status=1&deptId={{key}}`,
@@ -440,9 +441,9 @@
{
required: true,
message: "请选择保安",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "保安员",
@@ -463,9 +464,9 @@
{
required: true,
message: "请选择保安",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
@@ -479,9 +480,9 @@
{
required: true,
message: "请输入身份证",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -501,9 +502,9 @@
{
required: true,
message: "请输入派遣地址",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -522,9 +523,9 @@
{
required: true,
message: "请输入派遣时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// overHidden: true
},
{
@@ -539,9 +540,9 @@
{
required: true,
message: "请输入结束时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -564,12 +565,12 @@
{
required: true,
message: "请输入时间",
- trigger: "blur",
- },
- ],
- },
- ],
- },
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
+ }
};
},
created() {
@@ -589,17 +590,17 @@
// },
ids1() {
let ids1 = [];
- this.selectionList1.forEach((ele) => {
+ this.selectionList1.forEach(ele => {
ids1.push(ele.id);
});
return ids1.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
+ userInfo: state => state.user.userInfo
}),
deps() {
return this.form.deptId;
- },
+ }
},
methods: {
@@ -616,13 +617,13 @@
...params,
beginTime: releaseTimeRange[0],
overTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
values.releaseTimeRange = null;
} else {
values = {
...params,
- ...this.query,
+ ...this.query
};
}
@@ -647,7 +648,7 @@
page.pageSize,
// Object.assign(params, this.query2)
values
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page2.total = data.total;
this.data2 = data.records;
@@ -674,16 +675,16 @@
// }
adddata1(form).then(
- (res) => {
+ res => {
this.refreshChange2();
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -705,11 +706,11 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -719,7 +720,7 @@
this.$confirm("确定结束当前派遣?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
console.log(row);
@@ -730,7 +731,7 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -767,15 +768,15 @@
// }
adddata1(form).then(
- (res) => {
+ res => {
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -802,11 +803,11 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -816,7 +817,7 @@
this.$confirm("确定结束当前派遣?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return overDispatcher(row);
@@ -825,7 +826,7 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -842,7 +843,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(this.ids1);
@@ -851,7 +852,7 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec1.toggleSelection();
});
@@ -911,14 +912,14 @@
beginTime: releaseTimeRange[0],
overTime: releaseTimeRange[1],
...this.query,
- ...this.card,
+ ...this.card
};
values.releaseTimeRange = null;
} else {
values = {
...params,
...this.query,
- ...this.card,
+ ...this.card
};
}
@@ -937,10 +938,11 @@
page.pageSize,
// Object.assign(params, this.query)
values
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page1.total = data.total;
this.data1 = data.records;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading1 = false;
// this.$nextTick(() => this.$refs.crudrec1.dicInit("cascader"));
// console.log(this.form, 111111);
@@ -949,7 +951,7 @@
initData(type, d = 1) {
var that = this;
if (type == 1) {
- getDispatcherUnitByDeptId(null).then((res) => {
+ getDispatcherUnitByDeptId(null).then(res => {
const dispatcherUnitIdColumn = that.findObject(
this["option" + d].column,
"dispatcherUnitId"
@@ -959,14 +961,14 @@
});
}
if (type == 2) {
- getDispatcherUnitByDeptId(that.userInfo.dept_id).then((res) => {
+ getDispatcherUnitByDeptId(that.userInfo.dept_id).then(res => {
const dispatcherUnitIdColumn = that.findObject(
this["option" + d].column,
"dispatcherUnitId"
);
dispatcherUnitIdColumn.dicData = res.data.data;
});
- getListByDeptId(that.userInfo.dept_id, 1).then((res) => {
+ getListByDeptId(that.userInfo.dept_id, 1).then(res => {
const userIdsColumn = that.findObject(
this["option" + d].column,
"userIds"
@@ -974,7 +976,7 @@
userIdsColumn.dicData = res.data.data;
});
}
- },
+ }
},
// watch: {
// // "form.deptId"() {
@@ -985,8 +987,9 @@
// }
// },
mounted() {
- this.onLoad1(this.page1, this.query1);
- },
+ this.$store.commit("setWindowSizeHeightAdd");
+ // this.onLoad1(this.page1, this.query1);
+ }
};
</script>
diff --git a/src/views/securityAnalysis/child/assignment.vue b/src/views/securityAnalysis/child/assignment.vue
index 4a2bfb7..b1a5207 100644
--- a/src/views/securityAnalysis/child/assignment.vue
+++ b/src/views/securityAnalysis/child/assignment.vue
@@ -2,15 +2,17 @@
<div
:class="[
'certificateTJ',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option1"
:data="data1"
:page.sync="page1"
:table-loading="loading1"
- @on-load="getPractitionersPageInfo(page1)"
+ @on-load="getPractitionersPageInfo"
@search-change="searchChange"
@search-reset="searchReset"
@refresh-change="refreshChange"
@@ -46,7 +48,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query1: {},
data1: [],
@@ -76,7 +78,7 @@
searchLabelWidth: "50",
overHidden: true,
searchSpan: 4,
- search: true,
+ search: true
},
{
label: "企业名称",
@@ -87,14 +89,14 @@
dicUrl: dicUrl,
props: {
label: "title",
- value: "id",
+ value: "id"
},
// hide: true,
// slot: true,
searchSpan: 4,
display: false,
search: search,
- minWidth: 220,
+ minWidth: 220
},
{
label: "性别",
@@ -103,74 +105,78 @@
dicData: [
{
label: "男",
- value: 1,
+ value: 1
},
{
label: "女",
- value: 2,
+ value: 2
},
{
label: "未知",
- value: 3,
- },
+ value: 3
+ }
],
- display: false,
+ display: false
},
{
label: "身份证号码",
prop: "cardid",
search: true,
searchLabelWidth: 90,
- searchSpan: 5,
+ searchSpan: 5
},
{
label: "年龄",
- prop: "age",
+ prop: "age"
},
{
label: "年龄",
prop: "ageType",
type: "select",
- hide:true,
- search:true,
- searchSpan:4,
- dicData:[
+ hide: true,
+ search: true,
+ searchSpan: 4,
+ dicData: [
{
- label:"全部",
- value:4
+ label: "全部",
+ value: 4
},
{
- label:"18-30周岁",
- value:1
+ label: "18-30周岁",
+ value: 1
},
{
- label:"30-45周岁",
- value:2
+ label: "30-45周岁",
+ value: 2
},
{
- label:"45-60周岁",
- value:3
- },
+ label: "45-60周岁",
+ value: 3
+ }
],
rules: [
{
required: true,
message: "请选择年龄",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "联系电话",
prop: "phone",
- display: false,
- },
- ],
- },
+ display: false
+ }
+ ]
+ }
};
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
getPractitionersPageInfo(page, params = {}) {
+ this.loading1 = true;
if (this.card.jurisdiction == 1372091709474910209) {
this.card.jurisdiction = "";
}
@@ -179,13 +185,14 @@
...this.card,
...params,
status: 1,
- ...this.query1,
+ ...this.query1
};
- getList(page.currentPage, page.pageSize, params).then((res) => {
+ getList(page.currentPage, page.pageSize, params).then(res => {
// console.log(res.data.data.records);
const data = res.data.data;
this.data1 = data.records;
this.page1.total = data.total;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading1 = false;
});
},
@@ -202,10 +209,9 @@
this.query1 = {};
this.page1.currentPage = 1;
this.refreshChange();
- },
- },
+ }
+ }
};
</script>
-<style scoped>
-</style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/views/securityAnalysis/child/certificate.vue b/src/views/securityAnalysis/child/certificate.vue
index ecddb9c..9bfabdf 100644
--- a/src/views/securityAnalysis/child/certificate.vue
+++ b/src/views/securityAnalysis/child/certificate.vue
@@ -2,17 +2,19 @@
<div
:class="[
'certificateTJ',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option1"
:data="data1"
:page.sync="page1"
:search.sync="search"
:table-loading="loading1"
- @sort-change="sortChange"
- @on-load="getPractitionersPageInfo(page1)"
+ @sort-change="sortChange"
+ @on-load="getPractitionersPageInfo"
@search-change="searchChange"
@search-reset="searchReset"
@refresh-change="refreshChange"
@@ -49,10 +51,10 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query1: {},
- search:{},
+ search: {},
data1: [],
option1: {
addBtn: false,
@@ -81,7 +83,7 @@
width: 80,
overHidden: true,
searchSpan: 3,
- search: true,
+ search: true
},
{
label: "企业名称",
@@ -89,16 +91,16 @@
// prop: "deptName",
prop: "deptId",
type: "tree",
- sortable:true,
+ sortable: true,
dicUrl: dicUrl,
props: {
label: "title",
- value: "id",
+ value: "id"
},
searchSpan: 5,
display: false,
search: true,
- minWidth: 220,
+ minWidth: 220
},
{
label: "性别",
@@ -108,18 +110,18 @@
dicData: [
{
label: "男",
- value: 1,
+ value: 1
},
{
label: "女",
- value: 2,
+ value: 2
},
{
label: "未知",
- value: 3,
- },
+ value: 3
+ }
],
- display: false,
+ display: false
},
{
label: "身份证号码",
@@ -128,7 +130,7 @@
searchLabelWidth: 90,
searchSpan: 5,
minWidth: 140,
- display: false,
+ display: false
},
{
label: "学历",
@@ -138,7 +140,7 @@
dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
type: "select",
// hide: true,
@@ -146,15 +148,15 @@
{
required: true,
message: "请选择学历",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "联系电话",
prop: "phone",
minWidth: 100,
- display: false,
+ display: false
},
{
label: "是否持证",
@@ -167,31 +169,34 @@
dicData: [
{
label: "持证",
- value: "1",
+ value: "1"
},
{
label: "未持证",
- value: "2",
+ value: "2"
},
{
label: "已吊销",
- value: "3",
- },
- ],
+ value: "3"
+ }
+ ]
},
{
label: "保安证编号",
prop: "securitynumber",
- disabled: true,
+ disabled: true
},
{
label: "发证时间",
prop: "paperTime",
- disabled: true,
- },
- ],
- },
+ disabled: true
+ }
+ ]
+ }
};
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
//排序
@@ -218,9 +223,9 @@
params = this.search;
var that = this;
if (this.card.jurisdiction == 1372091709474910209) {
- params['jurisdiction'] = "";
- }else{
- params['jurisdiction'] = this.card.jurisdiction;
+ params["jurisdiction"] = "";
+ } else {
+ params["jurisdiction"] = this.card.jurisdiction;
}
if (this.sort) {
params["sort"] = this.sort;
@@ -228,17 +233,18 @@
if (this.sortName) {
params["sortName"] = this.sortName;
}
- params['status'] = 1;
+ params["status"] = 1;
params = {
...params,
- ...this.query1,
+ ...this.query1
};
- getList(page.currentPage, page.pageSize, params).then((res) => {
+ getList(page.currentPage, page.pageSize, params).then(res => {
const data = res.data.data;
this.data1 = data.records;
this.page1.total = data.total;
this.loading1 = false;
+ this.$store.commit("setWindowSizeHeightAdd");
that.selectionClear();
});
},
@@ -254,10 +260,9 @@
searchReset() {
this.query = {};
this.getPractitionersPageInfo(this.page1, this.query1);
- },
- },
+ }
+ }
};
</script>
-<style scoped>
-</style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/views/securityAnalysis/child/dispatch.vue b/src/views/securityAnalysis/child/dispatch.vue
index 2ad7f87..34673e1 100644
--- a/src/views/securityAnalysis/child/dispatch.vue
+++ b/src/views/securityAnalysis/child/dispatch.vue
@@ -2,15 +2,17 @@
<div
:class="[
'certificateTJ',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option1"
:data="data1"
:page.sync="page1"
:table-loading="loading1"
- @on-load="getPractitionersPageInfo(page1)"
+ @on-load="getPractitionersPageInfo"
@search-change="searchChange"
@search-reset="searchReset"
@refresh-change="refreshChange"
@@ -45,7 +47,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query1: {},
data1: [],
@@ -78,7 +80,7 @@
searchSpan: 5,
width: 210,
// span: 12,
- labelWidth: 118,
+ labelWidth: 118
},
// {
// label: "派遣单位地址",
@@ -99,7 +101,7 @@
dicUrl: dicUrl,
props: {
label: "title",
- value: "id",
+ value: "id"
},
// hide: true,
// hide: !website.tenantMode,
@@ -110,14 +112,14 @@
{
required: true,
message: "请选择保安公司",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
labelWidth: 118,
width: 230,
searchLabelWidth: 80,
search: search,
- searchSpan: 5,
+ searchSpan: 5
// editDisplay: false,
// addDisplay: false,
// hide: true,
@@ -166,7 +168,7 @@
searchSpan: 4,
overHidden: true,
// span: 12,
- labelWidth: 118,
+ labelWidth: 118
},
{
label: "合同生效时间",
@@ -187,18 +189,18 @@
{
required: true,
message: "请输入时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
-
+
{
label: "合同开始时间",
prop: "startTime",
labelWidth: 118,
type: "date",
format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd"
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -209,7 +211,7 @@
labelWidth: 118,
type: "date",
format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd"
// search: true,
// searchSpan: 4,
// overHidden: true
@@ -218,18 +220,18 @@
label: " 派遣人数",
prop: "snum",
labelWidth: 118,
- width:90
+ width: 90
},
{
label: " 负责人",
prop: "linkman",
- labelWidth: 118,
+ labelWidth: 118
},
{
label: "负责人联系方式",
prop: "phone",
labelWidth: 118,
- width: 110,
+ width: 110
},
{
label: "所属辖区",
@@ -244,7 +246,7 @@
dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
checkStrictly: true,
slot: true,
@@ -252,9 +254,9 @@
{
required: true,
message: "请选择所属辖区",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "所属辖区",
@@ -270,7 +272,7 @@
dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
checkStrictly: true,
slot: true,
@@ -278,13 +280,16 @@
{
required: true,
message: "请选择所属辖区",
- trigger: "click",
- },
- ],
- },
- ],
- },
+ trigger: "click"
+ }
+ ]
+ }
+ ]
+ }
};
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
getStartTime() {
@@ -308,6 +313,7 @@
return "";
},
getPractitionersPageInfo(page, params = {}) {
+ this.loading1 = true;
if (this.card.jurisdiction == 1372091709474910209) {
this.card.jurisdiction = "";
}
@@ -320,7 +326,7 @@
beginTime: releaseTimeRange[0],
overTime: releaseTimeRange[1],
status: 1,
- ...this.query1,
+ ...this.query1
};
// values.releaseTimeRange = null;
} else {
@@ -328,15 +334,16 @@
...params,
...this.card,
...this.query1,
- status: 1,
+ status: 1
};
}
// console.log(params);
- getdata(page.currentPage, page.pageSize, params).then((res) => {
+ getdata(page.currentPage, page.pageSize, params).then(res => {
// console.log(res.data.data.records);
const data = res.data.data;
this.data1 = data.records;
this.page1.total = data.total;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading1 = false;
});
},
@@ -358,10 +365,9 @@
this.page1.currentPage = 1;
this.refreshChange();
// console.log(212);
- },
- },
+ }
+ }
};
</script>
-<style scoped>
-</style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/views/securityAnalysis/child/examination.vue b/src/views/securityAnalysis/child/examination.vue
index bd5a11f..8eee24b 100644
--- a/src/views/securityAnalysis/child/examination.vue
+++ b/src/views/securityAnalysis/child/examination.vue
@@ -2,16 +2,18 @@
<div
:class="[
'certificateTJ',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option1"
:data="data1"
:page.sync="page1"
:search.sync="search"
:table-loading="loading1"
- @on-load="getPractitionersPageInfo(page1)"
+ @on-load="getPractitionersPageInfo"
@search-change="searchChange"
@search-reset="searchReset"
@refresh-change="refreshChange"
@@ -22,7 +24,7 @@
<script>
import {
- getinformationstatisticsXX, //保安员考试情况详情统计
+ getinformationstatisticsXX //保安员考试情况详情统计
} from "@/api/securityAnalysis/securityAnalysis";
export default {
props: ["card"],
@@ -35,9 +37,9 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
- search:{},
+ search: {},
query1: {},
data1: [],
option1: {
@@ -64,50 +66,50 @@
prop: "securityName",
disabled: true,
search: true,
- searchSpan:4
+ searchSpan: 4
},
{
label: "学校名称",
prop: "trainingUnitName",
disabled: true,
search: true,
- minWidth:160
+ minWidth: 160
},
{
label: "考试场次",
prop: "examName",
disabled: true,
- minWidth:160
+ minWidth: 160
},
{
label: "考试时间",
prop: "examTime",
- disabled: true,
+ disabled: true
},
{
- label: "考试时间",
- prop: "month",
- type: "month",
- hide:true,
- search:true,
- searchSpan:4,
- format: "yyyy-MM",
- valueFormat: "yyyy-MM",
+ label: "考试时间",
+ prop: "month",
+ type: "month",
+ hide: true,
+ search: true,
+ searchSpan: 4,
+ format: "yyyy-MM",
+ valueFormat: "yyyy-MM"
},
{
label: "理论成绩",
prop: "theoryGrade",
- disabled: true,
+ disabled: true
},
{
label: "实操成绩",
prop: "learnGrade",
- disabled: true,
+ disabled: true
},
{
label: "总分数",
prop: "allGrade",
- disabled: true,
+ disabled: true
},
{
label: "是否合格",
@@ -118,33 +120,37 @@
dicData: [
{
label: "合格",
- value: 0,
+ value: 0
},
{
label: "不合格",
- value: 1,
+ value: 1
},
{
label: "暂未录实操成绩",
- value: 2,
+ value: 2
},
{
label: "缺考,成绩无效",
- value: 3,
- },
- ],
- },
- ],
- },
+ value: 3
+ }
+ ]
+ }
+ ]
+ }
};
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
getPractitionersPageInfo(page, params = {}) {
+ this.loading1 = true;
params = this.search;
- params['deptId'] = this.card.deptid;
- params['jurisdiction'] = this.card.jurisdiction;
+ params["deptId"] = this.card.deptid;
+ params["jurisdiction"] = this.card.jurisdiction;
getinformationstatisticsXX(page.currentPage, page.pageSize, params).then(
- (res) => {
+ res => {
const data = res.data.data;
var d = data.records;
for (var k in d) {
@@ -160,6 +166,7 @@
}
this.data1 = d;
this.page1.total = data.total;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading1 = false;
}
);
@@ -175,10 +182,9 @@
},
searchReset(done) {
this.data1 = this.czdata;
- },
- },
+ }
+ }
};
</script>
-<style scoped>
-</style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/views/securityAnalysis/child/loginRecord.vue b/src/views/securityAnalysis/child/loginRecord.vue
index c573352..3ae3092 100644
--- a/src/views/securityAnalysis/child/loginRecord.vue
+++ b/src/views/securityAnalysis/child/loginRecord.vue
@@ -2,29 +2,31 @@
<div
:class="[
'certificateTJ',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:data="data"
:page.sync="page"
:search.sync="search"
:table-loading="loading"
- @on-load="onLoad(page)"
+ @on-load="onLoad"
@search-change="searchChange"
@search-reset="searchReset"
@refresh-change="refreshChange"
>
<template slot="menuLeft">
- <el-button
- type="warning"
- size="small"
- plain
- icon="el-icon-download"
- @click="handleExportLoginRecord"
- >导出
- </el-button>
+ <el-button
+ type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExportLoginRecord"
+ >导出
+ </el-button>
</template>
</avue-crud>
</div>
@@ -46,7 +48,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query: {},
search: {},
@@ -78,9 +80,9 @@
{
required: true,
message: "请输入登录时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "企业名称",
@@ -88,12 +90,12 @@
disabled: true,
overHidden: true,
searchSpan: 5,
- search: true,
+ search: true
},
{
label: "所属辖区",
prop: "jurisdictionName",
- display: false,
+ display: false
},
{
label: "企业属性",
@@ -103,68 +105,72 @@
dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
type: "select",
rules: [
{
required: true,
message: "请选择企业属性",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "最近一次登录时间",
prop: "createTime",
minWidth: 100,
- display: false,
+ display: false
},
{
label: "登录次数",
prop: "num",
- disabled: false,
+ disabled: false
},
{
label: "是否有登录",
prop: "types",
search: true,
disabled: false,
- searchLabelWidth:110,
+ searchLabelWidth: 110,
type: "select",
searchSpan: 5,
- hide:true,
+ hide: true,
dicData: [
{
label: "全部",
- value: 3,
+ value: 3
},
{
label: "是",
- value: 2,
+ value: 2
},
{
label: "否",
- value: 1,
- },
- ],
- },
- ],
- },
+ value: 1
+ }
+ ]
+ }
+ ]
+ }
};
},
- computed:{
- ...mapGetters(["userInfo", "permission"]),
+ computed: {
+ ...mapGetters(["userInfo", "permission"])
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
onLoad(page, params = {}) {
+ this.loading = true;
params = this.search;
- params['jurisdiction'] = this.userInfo.jurisdiction;
+ params["jurisdiction"] = this.userInfo.jurisdiction;
const { releaseTimeRange } = this.query;
let values = {
- ...params,
+ ...params
};
if (releaseTimeRange) {
values = {
@@ -172,17 +178,20 @@
...params,
startTime: releaseTimeRange[0],
endTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
values.releaseTimeRange = null;
}
- getInformationLoginPage(page.currentPage, page.pageSize, values).then((res) => {
- const data = res.data.data;
- this.data = data.records;
- this.page.total = data.total;
- this.loading = false;
- });
+ getInformationLoginPage(page.currentPage, page.pageSize, values).then(
+ res => {
+ const data = res.data.data;
+ this.data = data.records;
+ this.page.total = data.total;
+ this.$store.commit("setWindowSizeHeightAdd");
+ this.loading = false;
+ }
+ );
},
refreshChange() {
this.onLoad(this.page, this.query);
@@ -203,7 +212,7 @@
this.$confirm("是否导出企业登录记录数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
//获取查询条件
const { releaseTimeRange } = this.search;
@@ -212,12 +221,12 @@
this.search["endTime"] = releaseTimeRange[1];
}
var data = {
- jurisdiction:this.userInfo.jurisdiction,
+ jurisdiction: this.userInfo.jurisdiction,
stats: this.search.stats,
deptName: this.search.deptName,
types: this.search.types,
startTime: this.search.startTime,
- endTime: this.search.endTime,
+ endTime: this.search.endTime
};
// console.log(data,123);
//序列号url形式，用&拼接
@@ -228,10 +237,9 @@
}=${getToken()}&` + data
);
});
- },
- },
+ }
+ }
};
</script>
-<style scoped>
-</style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/views/securityAnalysis/child/situation.vue b/src/views/securityAnalysis/child/situation.vue
index 365666c..c6e1d86 100644
--- a/src/views/securityAnalysis/child/situation.vue
+++ b/src/views/securityAnalysis/child/situation.vue
@@ -2,15 +2,17 @@
<div
:class="[
'certificateTJ',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option1"
:data="data1"
:page.sync="page1"
:table-loading="loading1"
- @on-load="getPractitionersPageInfo(page1)"
+ @on-load="getPractitionersPageInfo"
@search-change="searchChange"
@search-reset="searchReset"
@refresh-change="refreshChange"
@@ -46,7 +48,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query1: {},
data1: [],
@@ -77,7 +79,7 @@
width: 80,
overHidden: true,
searchSpan: 3,
- search: true,
+ search: true
},
{
label: "企业名称",
@@ -87,14 +89,14 @@
dicUrl: dicUrl,
props: {
label: "title",
- value: "id",
+ value: "id"
},
// hide: true,
// slot: true,
searchSpan: 5,
display: false,
search: search,
- minWidth: 220,
+ minWidth: 220
},
{
label: "性别",
@@ -104,18 +106,18 @@
dicData: [
{
label: "男",
- value: 1,
+ value: 1
},
{
label: "女",
- value: 2,
+ value: 2
},
{
label: "未知",
- value: 3,
- },
+ value: 3
+ }
],
- display: false,
+ display: false
},
{
label: "身份证号码",
@@ -124,7 +126,7 @@
searchLabelWidth: 90,
searchSpan: 5,
minWidth: 140,
- display: false,
+ display: false
},
{
label: "学历",
@@ -134,7 +136,7 @@
dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
type: "select",
// hide: true,
@@ -142,15 +144,15 @@
{
required: true,
message: "请选择学历",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "联系电话",
prop: "phone",
minWidth: 100,
- display: false,
+ display: false
},
{
label: "审查状态",
@@ -163,25 +165,26 @@
dicData: [
{
label: "正常",
- value: "0",
+ value: "0"
},
{
label: "异常",
- value: "1",
- },
- ],
+ value: "1"
+ }
+ ]
},
{
label: "审查明细",
prop: "examinationMx",
- disabled: true,
- },
- ],
- },
+ disabled: true
+ }
+ ]
+ }
};
},
methods: {
getPractitionersPageInfo(page, params = {}) {
+ this.loading1 = true;
if (this.card.jurisdiction == 1372091709474910209) {
this.card.jurisdiction = "";
}
@@ -190,13 +193,14 @@
...this.card,
...params,
status: 1,
- ...this.query1,
+ ...this.query1
};
- getList(page.currentPage, page.pageSize, params).then((res) => {
+ getList(page.currentPage, page.pageSize, params).then(res => {
// console.log(res.data.data.records);
const data = res.data.data;
this.data1 = data.records;
this.page1.total = data.total;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading1 = false;
});
},
@@ -214,10 +218,9 @@
this.page1.currentPage = 1;
this.refreshChange();
// console.log(212);
- },
- },
+ }
+ }
};
</script>
-<style scoped>
-</style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/views/securityAnalysis/child/socialSecurity.vue b/src/views/securityAnalysis/child/socialSecurity.vue
index eccad1b..f263fa6 100644
--- a/src/views/securityAnalysis/child/socialSecurity.vue
+++ b/src/views/securityAnalysis/child/socialSecurity.vue
@@ -2,15 +2,17 @@
<div
:class="[
'certificateTJ',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option1"
:data="data1"
:page.sync="page1"
:table-loading="loading1"
- @on-load="getPractitionersPageInfo(page1)"
+ @on-load="getPractitionersPageInfo"
@search-change="searchChange"
@search-reset="searchReset"
@refresh-change="refreshChange"
@@ -46,7 +48,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query1: {},
data1: [],
@@ -76,7 +78,7 @@
searchLabelWidth: "50",
overHidden: true,
searchSpan: 4,
- search: true,
+ search: true
},
{
label: "企业名称",
@@ -87,14 +89,14 @@
dicUrl: dicUrl,
props: {
label: "title",
- value: "id",
+ value: "id"
},
// hide: true,
// slot: true,
searchSpan: 4,
display: false,
search: search,
- minWidth: 220,
+ minWidth: 220
},
{
label: "性别",
@@ -103,25 +105,25 @@
dicData: [
{
label: "男",
- value: 1,
+ value: 1
},
{
label: "女",
- value: 2,
+ value: 2
},
{
label: "未知",
- value: 3,
- },
+ value: 3
+ }
],
- display: false,
+ display: false
},
{
label: "身份证号码",
prop: "cardid",
search: true,
searchLabelWidth: 90,
- searchSpan: 5,
+ searchSpan: 5
},
{
label: "学历",
@@ -129,30 +131,34 @@
dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
type: "select",
- search:true,
- searchSpan:4,
+ search: true,
+ searchSpan: 4,
rules: [
{
required: true,
message: "请选择学历",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "联系电话",
prop: "phone",
- display: false,
- },
- ],
- },
+ display: false
+ }
+ ]
+ }
};
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
getPractitionersPageInfo(page, params = {}) {
+ this.loading1 = true;
if (this.card.jurisdiction == 1372091709474910209) {
this.card.jurisdiction = "";
}
@@ -161,13 +167,14 @@
...this.card,
...params,
status: 1,
- ...this.query1,
+ ...this.query1
};
- getList(page.currentPage, page.pageSize, params).then((res) => {
+ getList(page.currentPage, page.pageSize, params).then(res => {
// console.log(res.data.data.records);
const data = res.data.data;
this.data1 = data.records;
this.page1.total = data.total;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading1 = false;
});
},
@@ -184,10 +191,9 @@
this.query1 = {};
this.page1.currentPage = 1;
this.refreshChange();
- },
- },
+ }
+ }
};
</script>
-<style scoped>
-</style>
\ No newline at end of file
+<style scoped></style>
diff --git a/src/views/securityAnalysis/index.vue b/src/views/securityAnalysis/index.vue
index e6b3b88..1f4c38d 100644
--- a/src/views/securityAnalysis/index.vue
+++ b/src/views/securityAnalysis/index.vue
@@ -5,44 +5,117 @@
<!-- 保安员审查情况统计
<div>饼图</div> -->
<!-- </div> -->
-
+
<div class="examinesBtn" v-if="examineBtnVisiable">
- <el-radio-group v-model="tabPosition" style="margin-bottom: 30px" size="small" @change="handleClick">
+ <!-- <el-radio-group
+ v-model="tabPosition"
+ size="small"
+ @change="handleClick"
+ >
<el-radio-button label="1">保安员审查情况统计</el-radio-button>
<el-radio-button label="2">企业登录预警情况统计</el-radio-button>
- </el-radio-group>
+ </el-radio-group> -->
+ <el-dropdown class="examinesBtnChouse" @command="handleClick">
+ <span class="el-dropdown-link">
+ {{ examinesBtnChousetext }} <i class="el-icon-caret-bottom"></i>
+ </span>
+ <el-dropdown-menu slot="dropdown">
+ <el-dropdown-item command="1">保安员审查情况统计</el-dropdown-item>
+ <el-dropdown-item command="2"
+ >企业登录预警情况统计</el-dropdown-item
+ >
+ </el-dropdown-menu>
+ </el-dropdown>
+ <!-- <div class="examinesBtnChouse">
+ {{ examinesBtnChousetext }} <i class="el-icon-caret-bottom"></i>
+ </div> -->
</div>
- <div id="ech1" class="examines" ref="ech1" style="visibility:visible;z-index:666">
- </div>
- <div id="ech1s" class="examiness" ref="ech1s" style="visibility:hidden;z-index:333">
- </div>
- <!-- 保安员审查情况统计
- <div>饼图</div> -->
-
- <div class="certificate" ref="ech2">
- <!-- 保安员持证情况统计
- <div>饼图</div> -->
+ <div class="examines" v-show="showECH1">
+ <img
+ src="http://223.82.109.183:2080/img/table.png"
+ alt=""
+ class="myToolbox"
+ @click="openMyToolBox('保安员审查情况明细', 1)"
+ />
+ <div id="ech1" class="examinesin" ref="ech1">1</div>
</div>
+ <div class="examiness" v-show="!showECH1">
+ <img
+ src="http://223.82.109.183:2080/img/table.png"
+ alt=""
+ class="myToolbox"
+ @click="openMyToolBox('企业登录情况明细', 7)"
+ />
+ <div id="ech1s" class="examinessin" ref="ech1s"></div>
+ </div>
+ <!-- 保安员审查情况统计
+ <div>饼图</div> -->
+ <div class="certificate">
+ <img
+ src="http://223.82.109.183:2080/img/table.png"
+ alt=""
+ class="myToolbox"
+ @click="openMyToolBox('保安员持证情况明细', 2)"
+ />
+ <div class="certificatein" ref="ech2">
+ <!-- 保安员持证情况统计
+ <div>饼图</div> -->
+ </div>
+ </div>
+
<!-- <div class="czbut"></div> -->
</div>
<div class="securityAnalysiscenter">
- <div class="examination" ref="ech3">
- <!-- 保安员考试情况统计
+ <div class="examination">
+ <img
+ src="http://223.82.109.183:2080/img/table.png"
+ alt=""
+ class="myToolbox"
+ @click="openMyToolBox('保安员考试情况明细', 3)"
+ />
+ <div class="examinationin" ref="ech3">
+ <!-- 保安员考试情况统计
<div>堆叠面积图</div> -->
+ </div>
</div>
- <div class="dispatchUnit" ref="ech4">
- <!-- 派遣服务单位统计
+
+ <div class="dispatchUnit">
+ <img
+ src="http://223.82.109.183:2080/img/table.png"
+ alt=""
+ class="myToolbox"
+ @click="openMyToolBox('派遣服务单位明细', 4)"
+ />
+ <div class="dispatchUnitin" ref="ech4">
+ <!-- 派遣服务单位统计
<div>柱状图</div> -->
+ </div>
</div>
</div>
<div class="securityAnalysisright">
- <div class="dispatchSecurity" ref="ech5">
- <!-- 保安员年龄分布情况统计
+ <div class="dispatchSecurity">
+ <img
+ src="http://223.82.109.183:2080/img/table.png"
+ alt=""
+ class="myToolbox"
+ @click="openMyToolBox('保安员年龄分布情况明细', 5)"
+ />
+ <div class="dispatchSecurityin" ref="ech5">
+ <!-- 保安员年龄分布情况统计
<div>饼图</div> -->
+ </div>
</div>
- <div class="socialSecurity" ref="ech6">
- <!-- 社保缴纳情况统计
+ <div class="socialSecurity">
+ <img
+ src="http://223.82.109.183:2080/img/table.png"
+ alt=""
+ class="myToolbox"
+ @click="openMyToolBox('保安员学历分布情况明细', 6)"
+ />
+ <div class="socialSecurityin" ref="ech6">
+ <!-- 社保缴纳情况统计
<div>饼图</div> -->
+ </div>
</div>
</div>
<div>
@@ -62,10 +135,7 @@
<!-- 保安员审查情况统计 -->
</situation>
- <loginRecord
- :card="{ jurisdiction: jurisdiction }"
- v-if="sees == 7"
- >
+ <loginRecord :card="{ jurisdiction: jurisdiction }" v-if="sees == 7">
<!-- 保安员审查情况统计 -->
</loginRecord>
@@ -117,6 +187,7 @@
getEducationStatistics,
getLoginDataStatistics
} from "@/api/securityAnalysis/securityAnalysis";
+import { mapGetters } from "vuex";
import { mapState } from "vuex";
import { getRoleDetail } from "@/api/system/role";
import certificate from "./child/certificate.vue";
@@ -146,36 +217,40 @@
EC5: "", //保安派遣情况统计 // 饼图
EC6: "", //社保缴纳情况统计 // 饼图
deptid: "",
- oneVisiable:true,
- examineBtnVisiable:true,
+ oneVisiable: true,
+ examineBtnVisiable: true,
jurisdiction: "",
tabPosition: 1,
- examinetionTitle:"保安员审查情况统计",
+ examinetionTitle: "保安员审查情况统计",
examine1: [],
dialogVisible: false,
titles: "",
sees: "",
colors: ["#29C093", "#F34A4A"], //[正常，异常]；
+ showECH1: true, //显示保安员审查情况统计或企业登录预警情况统计
+ changeSizeTime: null,
+ examinesBtnChousetext: "保安员审查情况统计"
};
},
computed: {
...mapState({
- userInfo: (state) => state.user.userInfo,
+ userInfo: state => state.user.userInfo
}),
+ ...mapGetters(["windowWidth", "windowHeight"]),
ids1() {
let ids1 = [];
- this.selectionList1.forEach((ele) => {
+ this.selectionList1.forEach(ele => {
ids1.push(ele.id);
});
return ids1.join(",");
},
ids2() {
let ids2 = [];
- this.selectionList2.forEach((ele) => {
+ this.selectionList2.forEach(ele => {
ids2.push(ele.id);
});
return ids2.join(",");
- },
+ }
},
watch: {
dialogVisible() {
@@ -198,21 +273,58 @@
this.getEC6();
}
},
+ windowWidth() {
+ let that = this;
+ if (that.changeSizeTime) {
+ return;
+ } else {
+ that.changeSizeTime = setTimeout(() => {
+ that.changeSize();
+ clearTimeout(that.changeSizeTime);
+ that.changeSizeTime = null;
+ }, 600);
+ }
+ },
+ windowHeight() {
+ let that = this;
+ if (that.changeSizeTime) {
+ return;
+ } else {
+ that.changeSizeTime = setTimeout(() => {
+ that.changeSize();
+ clearTimeout(that.changeSizeTime);
+ that.changeSizeTime = null;
+ }, 600);
+ }
+ }
},
methods: {
+ //更新图表尺寸
+ changeSize() {
+ console.log("更新图表尺寸");
+ this.EC1.resize();
+ this.EC1s.resize();
+ this.EC2.resize();
+ this.EC3.resize();
+ this.EC4.resize();
+ this.EC5.resize();
+ this.EC6.resize();
+ },
//tab 切换
- handleClick(val){
- if(val==1){
- document.getElementById("ech1").style.visibility = "visible";
- document.getElementById("ech1s").style.visibility = "hidden";
- }else{
- document.getElementById("ech1").style.visibility = "hidden";
- document.getElementById("ech1s").style.visibility = "visible";
+ handleClick(val) {
+ // if (val == this.tabPosition) {
+ // return;
+ // }
+ if (val == 1) {
+ this.showECH1 = true;
+ } else {
+ this.showECH1 = false;
}
this.tabPosition = val;
this.getEC1(val);
},
creatOurEcharts() {
+ // return;
this.EC1 = echarts.init(this.$refs.ech1);
this.EC1s = echarts.init(this.$refs.ech1s);
this.EC2 = echarts.init(this.$refs.ech2);
@@ -234,23 +346,23 @@
d = [
{
value: yes,
- name: okmsg,
+ name: okmsg
},
{
value: not,
- name: nomsg,
- },
+ name: nomsg
+ }
];
} else {
d = [
{
value: 0,
- name: okmsg,
+ name: okmsg
},
{
value: 0,
- name: nomsg,
- },
+ name: nomsg
+ }
];
}
// console.log(d, ok, no);
@@ -271,31 +383,41 @@
? "0%"
: Math.round((num / total) * 10000) / 100.0 + "%";
},
+ openMyToolBox(titles, id) {
+ var that = this;
+ that.dialogVisible = true;
+ that.sees = id;
+ that.titles = titles;
+ },
gettoolbox(title, titles, id) {
+ //由于在1366，,768分辨率下，会被覆盖掉不能点击，所以放弃
+ return;
var that = this;
return {
- show: true,
+ show: false,
itemSize: 25,
- top: 20,
- right: 20,
+ top: 5,
+ right: 15,
feature: {
myTool1: {
show: true,
+ zlevel: 999,
+ z: 999,
title: "点击查看详情",
icon: "image://http://223.82.109.183:2080/img/table.png",
- onclick: function () {
+ onclick: function() {
that.dialogVisible = true;
that.sees = id;
that.titles = titles;
- },
- },
- },
+ }
+ }
+ }
};
},
setColor(d, color) {
for (var k in d) {
var itemStyle = {
- color: color[k],
+ color: color[k]
};
d[k]["itemStyle"] = itemStyle;
}
@@ -304,49 +426,52 @@
},
getEC1(tab) {
var that = this;
- if(tab==1){
+ if (tab == 1) {
getinformationselectExtype(this.deptid, this.jurisdiction)
- .then((res) => {
- var a = res.data.data;
- var b = that.changedata(a, "zc", "bzc", "情况正常", "情况异常");
- that.setEC1(b);
- })
- .catch((res) => {
- var b = that.changedata([], "zc", "bzc", "情况正常", "情况异常");
- that.setEC1(b);
- });
+ .then(res => {
+ var a = res.data.data;
+ var b = that.changedata(a, "zc", "bzc", "情况正常", "情况异常");
+ that.setEC1(b);
+ that.EC1.resize();
+ })
+ .catch(res => {
+ var b = that.changedata([], "zc", "bzc", "情况正常", "情况异常");
+ that.setEC1(b);
+ that.EC1.resize();
+ });
}
- if(tab==2){
- getLoginDataStatistics(this.jurisdiction).then((res)=>{
+ if (tab == 2) {
+ getLoginDataStatistics(this.jurisdiction).then(res => {
var b = res.data.data;
var data = [
{
- value:b[0],
- name:"近14天登录企业数"
+ value: b[0],
+ name: "近14天登录企业数"
},
{
- value:b[1],
- name:"近14天未登录企业数"
+ value: b[1],
+ name: "近14天未登录企业数"
}
- ]
+ ];
that.setEC1s(data);
- })
+ that.EC1s.resize();
+ });
}
},
setEC1(d) {
this.examine1 = [
{
title: "审查时间：",
- value: this.getTime(),
+ value: this.getTime()
},
{
title: "问题保安员人数：",
- value: d[1].value + "人",
+ value: d[1].value + "人"
},
{
title: "问题保安员比例：",
- value: this.GetPercent(+d[1].value, +d[0].value + +d[1].value),
- },
+ value: this.GetPercent(+d[1].value, +d[0].value + +d[1].value)
+ }
];
var option, data;
data = this.setColor(d, this.colors);
@@ -354,16 +479,16 @@
title: {
text: this.examinetionTitle,
top: 25,
- left: "center",
+ left: "center"
},
tooltip: {
- trigger: "item",
+ trigger: "item"
},
legend: {
x: "center",
- y: "90%",
+ y: "90%"
},
- toolbox: this.gettoolbox("审查情况查询", "保安员审查情况明细", 1),
+ // toolbox: this.gettoolbox("审查情况查询", "保安员审查情况明细", 1),
series: [
{
// name: "访问来源",
@@ -374,42 +499,42 @@
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
- shadowColor: "rgba(0, 0, 0, 0.5)",
- },
+ shadowColor: "rgba(0, 0, 0, 0.5)"
+ }
},
label: {
formatter: "{name|{b}}\n({d}%)",
rich: {
time: {
fontSize: 10,
- color: "#999",
- },
- },
- },
- },
- ],
+ color: "#999"
+ }
+ }
+ }
+ }
+ ]
};
this.EC1.setOption(option);
},
//登录情况统计
setEC1s(d) {
- var option,data;
+ var option, data;
data = this.setColor(d, this.colors);
option = {
title: {
text: "",
top: 25,
- left: "center",
+ left: "center"
},
tooltip: {
- trigger: "item",
+ trigger: "item"
},
legend: {
x: "center",
- y: "90%",
+ y: "90%"
},
- toolbox: this.gettoolbox("登录情况查询", "企业登录情况明细", 7),
+ // toolbox: this.gettoolbox("登录情况查询", "企业登录情况明细", 7),
series: [
{
type: "pie",
@@ -419,32 +544,32 @@
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
- shadowColor: "rgba(0, 0, 0, 0.5)",
- },
+ shadowColor: "rgba(0, 0, 0, 0.5)"
+ }
},
label: {
formatter: "{name|{b}}\n({d}%)",
rich: {
time: {
fontSize: 10,
- color: "#999",
- },
- },
- },
- },
- ],
+ color: "#999"
+ }
+ }
+ }
+ }
+ ]
};
this.EC1s.setOption(option);
},
getEC2() {
var that = this;
getinformationselectHold(this.deptid, this.jurisdiction)
- .then((res) => {
+ .then(res => {
var a = res.data.data;
var b = that.changedata(a, "cz", "wcz", "持证", "未持证");
that.setEC2(b);
})
- .catch((res) => {
+ .catch(res => {
var b = that.changedata([], "cz", "wcz", "持证", "未持证");
that.setEC2(b);
});
@@ -459,18 +584,18 @@
text: "保安员持证情况统计",
// subtext: "纯属虚构",
top: 25,
- left: "center",
+ left: "center"
},
tooltip: {
- trigger: "item",
+ trigger: "item"
},
legend: {
// orient: "vertical",
// left: "left", x: "center",
x: "center",
- y: "83%",
+ y: "83%"
},
- toolbox: this.gettoolbox("持证情况查询", "保安员持证情况明细", 2),
+ // toolbox: this.gettoolbox("持证情况查询", "保安员持证情况明细", 2),
series: [
{
// name: "访问来源",
@@ -481,26 +606,26 @@
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
- shadowColor: "rgba(0, 0, 0, 0.5)",
- },
+ shadowColor: "rgba(0, 0, 0, 0.5)"
+ }
},
label: {
formatter: "{name|{b}}\n({d}%)",
rich: {
time: {
fontSize: 10,
- color: "#999",
- },
- },
- },
- },
- ],
+ color: "#999"
+ }
+ }
+ }
+ }
+ ]
};
this.EC2.setOption(option);
},
getEC3() {
- getExamStatisInfo(this.deptid, this.jurisdiction).then((res) => {
+ getExamStatisInfo(this.deptid, this.jurisdiction).then(res => {
this.setEC3(res.data.data);
});
},
@@ -508,16 +633,16 @@
setEC3(data) {
//获取年份
const seriesdata = [];
- data.forEach((item) => {
+ data.forEach(item => {
if (item.type == 1) {
seriesdata.push({
name: item.name + "-合格人数",
type: "bar",
stack: item.name,
emphasis: {
- focus: "series",
+ focus: "series"
},
- data: item.examSocreStatis,
+ data: item.examSocreStatis
});
}
if (item.type == 2) {
@@ -526,38 +651,38 @@
type: "bar",
stack: item.name,
emphasis: {
- focus: "series",
+ focus: "series"
},
- data: item.examSocreStatis,
+ data: item.examSocreStatis
});
}
});
var datetime = [
- "1月",
- "2月",
- "3月",
- "4月",
- "5月",
- "6月",
- "7月",
- "8月",
- "9月",
- "10月",
- "11月",
- "12月",
- ]
+ "1月",
+ "2月",
+ "3月",
+ "4月",
+ "5月",
+ "6月",
+ "7月",
+ "8月",
+ "9月",
+ "10月",
+ "11月",
+ "12月"
+ ];
//echarts 图表数据
var option = {
title: {
text: "保安员考试情况统计",
left: "center",
- top: 20,
+ top: 20
},
tooltip: {
trigger: "axis",
axisPointer: {
- type: "shadow",
- },
+ type: "shadow"
+ }
},
color: ["#91CD76", "#EF6667"],
legend: {
@@ -565,27 +690,27 @@
icon: "circle",
itemWidth: 10,
itemHeight: 10,
- itemGap: 20,
+ itemGap: 20
},
- toolbox: this.gettoolbox("考试情况查询", "保安员考试情况明细", 3),
+ // toolbox: this.gettoolbox("考试情况查询", "保安员考试情况明细", 3),
grid: {
left: "3%",
right: "4%",
bottom: "3%",
- containLabel: true,
+ containLabel: true
},
xAxis: [
{
type: "category",
data: datetime
- },
+ }
],
yAxis: [
{
- type: "value",
- },
+ type: "value"
+ }
],
- series: seriesdata,
+ series: seriesdata
};
this.EC3.setOption(option);
@@ -594,7 +719,7 @@
var date = new Date();
var nowYear = date.getFullYear();
var that = this;
- getinformationselectDis(this.deptid, this.jurisdiction).then((res) => {
+ getinformationselectDis(this.deptid, this.jurisdiction).then(res => {
var a = res.data,
d = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0];
@@ -639,7 +764,7 @@
"9月",
"10月",
"11月",
- "12月",
+ "12月"
];
var date = new Date();
var d = date.getFullYear();
@@ -648,52 +773,51 @@
title: {
text: "派遣服务单位统计",
top: 20,
- left: "center",
+ left: "center"
},
xAxis: {
type: "category",
- data: xxd,
+ data: xxd
// data: xd,
},
- toolbox: this.gettoolbox("派遣单位查询", "派遣服务单位明细", 4),
+ // toolbox: this.gettoolbox("派遣单位查询", "派遣服务单位明细", 4),
yAxis: {
- type: "value",
+ type: "value"
},
tooltip: {
trigger: "item",
- formatter: d + "年{b} : {c} 个",
+ formatter: d + "年{b} : {c} 个"
},
series: [
{
data: data,
- type: "bar",
- },
- ],
+ type: "bar"
+ }
+ ]
};
this.EC4.setOption(option);
},
getEC5() {
var that = this;
- getAgeStatistics(this.deptid, this.jurisdiction)
- .then((res) => {
- var data = res.data.data;
- var a = [
- {
- value:data[0],
- name:"18-30周岁"
- },
- {
- value:data[1],
- name:"30-45周岁"
- },
- {
- value:data[2],
- name:"45-60周岁"
- },
- ]
- console.log(a, "111111");
- this.setEC5(a);
- });
+ getAgeStatistics(this.deptid, this.jurisdiction).then(res => {
+ var data = res.data.data;
+ var a = [
+ {
+ value: data[0],
+ name: "18-30周岁"
+ },
+ {
+ value: data[1],
+ name: "30-45周岁"
+ },
+ {
+ value: data[2],
+ name: "45-60周岁"
+ }
+ ];
+ console.log(a, "111111");
+ this.setEC5(a);
+ });
},
setEC5(d) {
var option;
@@ -703,15 +827,19 @@
text: "保安员年龄分布情况统计",
// subtext: "纯属虚构",
top: 25,
- left: "center",
+ left: "center"
},
tooltip: {
- trigger: "item",
+ trigger: "item"
},
- toolbox: this.gettoolbox("保安员年龄分布情况查询", "保安员年龄分布情况明细", 5),
+ // toolbox: this.gettoolbox(
+ // "保安员年龄分布情况查询",
+ // "保安员年龄分布情况明细",
+ // 5
+ // ),
legend: {
x: "center",
- y: "90%",
+ y: "90%"
},
series: [
{
@@ -722,25 +850,24 @@
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
- shadowColor: "rgba(0, 0, 0, 0.5)",
- },
+ shadowColor: "rgba(0, 0, 0, 0.5)"
+ }
},
label: {
- formatter: "{b}\n({d}%)",
- },
- },
- ],
+ formatter: "{b}\n({d}%)"
+ }
+ }
+ ]
};
this.EC5.setOption(option);
},
getEC6() {
var that = this;
- getEducationStatistics(this.deptid, this.jurisdiction)
- .then((res) => {
- var a = res.data.data;
- that.setEC6(a);
- });
+ getEducationStatistics(this.deptid, this.jurisdiction).then(res => {
+ var a = res.data.data;
+ that.setEC6(a);
+ });
},
setEC6(d) {
var option;
@@ -749,17 +876,21 @@
title: {
text: "保安员学历分布情况统计",
top: 25,
- left: "center",
+ left: "center"
},
tooltip: {
- trigger: "item",
+ trigger: "item"
},
- toolbox: this.gettoolbox("保安员学历分布情况查询", "保安员学历分布情况明细", 6),
+ // toolbox: this.gettoolbox(
+ // "保安员学历分布情况查询",
+ // "保安员学历分布情况明细",
+ // 6
+ // ),
legend: {
// orient: "vertical",
// left: "left",
x: "center",
- y: "83%",
+ y: "83%"
},
series: [
{
@@ -771,8 +902,8 @@
itemStyle: {
shadowBlur: 10,
shadowOffsetX: 0,
- shadowColor: "rgba(0, 0, 0, 0.5)",
- },
+ shadowColor: "rgba(0, 0, 0, 0.5)"
+ }
},
label: {
// alignTo: "edge",
@@ -783,12 +914,12 @@
rich: {
time: {
fontSize: 10,
- color: "#999",
- },
- },
- },
- },
- ],
+ color: "#999"
+ }
+ }
+ }
+ }
+ ]
};
this.EC6.setOption(option);
@@ -806,21 +937,24 @@
// this.setEC4();
// this.setEC5();
// this.setEC6();
- },
+ }
},
- created(){
- if(this.userInfo.role_name == "保安公司管理员" || this.userInfo.role_name == "分公司管理员"){
+ created() {
+ if (
+ this.userInfo.role_name == "保安公司管理员" ||
+ this.userInfo.role_name == "分公司管理员"
+ ) {
this.examinetionTitle = "保安员审查情况统计";
this.examineBtnVisiable = false;
- }else {
+ } else {
this.examinetionTitle = "";
}
},
mounted() {
this.$nextTick(() => {
var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
+ roleIds.forEach(roleId => {
+ getRoleDetail(roleId).then(res => {
var roleAlias = res.data.data.roleAlias;
var roleName = res.data.data.roleName;
if (roleName != "保安公司管理员" && roleName != "分公司管理员") {
@@ -834,7 +968,7 @@
});
});
});
- },
+ }
};
</script>
@@ -842,20 +976,22 @@
$widths: 20%;
.securityAnalysis {
width: 100%;
- height: 100%;
+ height: calc(100% - 35px);
// border: 1px solid #000;
display: flex;
align-items: center;
justify-content: space-around;
box-sizing: border-box;
+
.securityAnalysisleft,
.securityAnalysiscenter,
.securityAnalysisright {
- // border: 1px solid #000;
+ // // border: 1px solid #000;
position: relative;
width: 29%;
height: 100%;
- box-sizing: border-box;
+ // border: 1px solid red;
+ // box-sizing: border-box;
display: flex;
align-items: center;
justify-content: space-around;
@@ -868,6 +1004,7 @@
.dispatchUnit,
.dispatchSecurity,
.socialSecurity {
+ position: relative;
width: 100%;
height: 49%;
// border: 1px solid #000;
@@ -875,62 +1012,65 @@
background-color: #fff;
}
- .certificate{
+ .certificate {
position: relative;
width: 100%;
height: 49%;
- top: 13.30rem;
+ // top: 13.3rem;
box-sizing: border-box;
background-color: #fff;
}
- .examinesBtn{
+ .examinesBtn {
+ top: 0;
+ left: 0;
position: absolute;
- top: 1.5rem;
- z-index: 999;
- left: 8rem;
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: center;
+ background-color: #fff;
+ .examinesBtnChouse {
+ background-color: #409eff;
+ padding: 5px 10px;
+ border-radius: 5px;
+ color: #fff;
+ position: relative;
+ top: 20px;
+ z-index: 900;
+ text-align: center;
+ }
}
- .examines{
- position: absolute;
- top: 0.25rem;
+ .examines,
+ .examiness {
width: 100%;
height: 49%;
- box-sizing: border-box;
+ // display: flex;
+ // align-items: center;
background-color: #fff;
}
- .examiness{
- position: absolute;
- top: 0.25rem;
+
+ //myself
+ .examinesin,
+ .examinessin,
+ .certificatein,
+ .examinationin,
+ .dispatchUnitin,
+ .dispatchSecurityin,
+ .socialSecurityin {
width: 100%;
- height: 49%;
- box-sizing: border-box;
- background-color: #fff;
+ height: 100%;
}
- // .examines {
- // width: 100%;
- // height: 49%;
- // display: flex;
- // align-items: center;
- // background-color: #fff;
- // }
- // .examine {
- // width: 100%;
- // height: 100%;
- // }
- // .examine1 {
- // width: 200px;
- // div {
- // margin-bottom: 10px;
- // }
- // }
- // .securityAnalysisleft {
- // width: $widths;
- // }
- // .securityAnalysiscenter {
- // width: $widths;
- // }
- // .securityAnalysisright {
- // width: $widths;
- // }
+ .myToolbox {
+ position: absolute;
+ top: 14px;
+ right: 20px;
+ width: 25px;
+ height: 25px;
+ cursor: pointer;
+ z-index: 1000;
+ &:hover {
+ }
+ }
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/securityEquipment/car.vue b/src/views/securityEquipment/car.vue
index d40bc4b..2872832 100644
--- a/src/views/securityEquipment/car.vue
+++ b/src/views/securityEquipment/car.vue
@@ -1,65 +1,65 @@
<template>
- <basic-container>
- <div
- :class="[
- 'equipments',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'equipments',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ v-if="visible"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec"
+ @on-load="onLoad"
+ :table-loading="loading"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
>
- <avue-crud
- v-if="visible"
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec"
- @on-load="onLoad"
- :table-loading="loading"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport"
+ >批量导入
+ </el-button>
+ </template>
+ </avue-crud>
+ <el-dialog
+ title="车辆导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
>
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete"
- >删 除
- </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport"
- >批量导入
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
</el-button>
</template>
- </avue-crud>
- <el-dialog
- title="车辆导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px"
- >
- <avue-form
- :option="excelOption"
- v-model="excelForm"
- :upload-after="uploadAfter"
- >
- <template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
- 点击下载<i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog>
- </div>
+ </avue-form>
+ </el-dialog>
</basic-container>
</template>
@@ -70,19 +70,6 @@
import { getToken } from "@/util/auth";
export default {
props: ["fromDeptId", "windowHeight"],
- watch: {
- windowHeight() {
- if (!this.windowHeight) {
- return;
- }
- this.option.height = this.windowHeight - 320;
- this.visible = false;
- this.$nextTick(() => {
- this.visible = true;
- this.refreshChange();
- });
- },
- },
data() {
return {
visible: true,
@@ -101,18 +88,18 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/car/import-car?deptId=" + this.deptIds,
+ action: "/api/car/import-car?deptId=" + this.deptIds
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
loading: true,
@@ -120,7 +107,7 @@
page: {
pageSize: 10,
currentPage: 1,
- total: 0,
+ total: 0
},
query: {},
data: [],
@@ -137,22 +124,23 @@
selection: true,
labelWidth: 110,
column: column,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
- useifid: 266,
+ useifid: 266
};
},
computed: {
...mapGetters(["userInfo"]),
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
this.deptIds = this.userInfo.dept_id;
},
created() {
@@ -170,7 +158,7 @@
//查询保安单位信息（包含子级）
const column = this.findObject(this.option.column, "deptId");
column.addDisplay = true;
- column.editDisplay = true;
+ column.editDisplay = true;
// column.search = false;
//默认全部展开
column.defaultExpandAll = true;
@@ -204,10 +192,9 @@
done();
},
handleTemplate() {
- window.open(`/api/car/export-template-car?${
- this.website.tokenHeader
- }=${getToken()}`
- );
+ window.open(
+ `/api/car/export-template-car?${this.website.tokenHeader}=${getToken()}`
+ );
},
sizeChange(val) {
this.page1.currentPage = 1;
@@ -232,11 +219,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -268,11 +255,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -282,7 +269,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -291,7 +278,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -306,7 +293,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -315,7 +302,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec.toggleSelection();
});
@@ -361,7 +348,10 @@
params["jurisdiction"] = that.userInfo.jurisdiction;
}
//保安公司进入
- if (this.userInfo.role_name == "保安公司管理员" || this.userInfo.role_name == "分公司管理员") {
+ if (
+ this.userInfo.role_name == "保安公司管理员" ||
+ this.userInfo.role_name == "分公司管理员"
+ ) {
params["deptId"] = that.userInfo.dept_id;
//导入action 修改
const importColumn = that.findObject(
@@ -376,10 +366,10 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
- data.records.forEach((item) => {
+ data.records.forEach(item => {
if (item.numberType == -1) {
item.numberType = null;
}
@@ -388,11 +378,12 @@
}
});
this.data = data.records;
- console.log(this.data);
+ this.$store.commit("setWindowSizeHeightAdd");
+ // console.log(this.data);
this.loading = false;
});
- },
- },
+ }
+ }
};
</script>
@@ -411,4 +402,4 @@
// .el-tag--light {
// padding: 0 !important;
// }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/securityEquipment/equipments.vue b/src/views/securityEquipment/equipments.vue
index 714bf37..ecc0053 100644
--- a/src/views/securityEquipment/equipments.vue
+++ b/src/views/securityEquipment/equipments.vue
@@ -1,65 +1,65 @@
<template>
- <basic-container>
- <div
- :class="[
- 'equipments',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'equipments',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ v-if="visible"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec"
+ @on-load="onLoad"
+ :table-loading="loading"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
>
- <avue-crud
- v-if="visible"
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec"
- @on-load="onLoad"
- :table-loading="loading"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport"
+ >批量导入
+ </el-button>
+ </template>
+ </avue-crud>
+ <el-dialog
+ title="装备附件批量导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
>
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete"
- >删 除
- </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport"
- >批量导入
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
</el-button>
</template>
- </avue-crud>
- <el-dialog
- title="装备附件批量导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px"
- >
- <avue-form
- :option="excelOption"
- v-model="excelForm"
- :upload-after="uploadAfter"
- >
- <template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
- 点击下载<i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog>
- </div>
+ </avue-form>
+ </el-dialog>
</basic-container>
</template>
@@ -70,19 +70,7 @@
import { getToken } from "@/util/auth";
export default {
props: ["fromDeptId", "windowHeight"],
- watch: {
- windowHeight() {
- if (!this.windowHeight) {
- return;
- }
- this.option.height = this.windowHeight - 320;
- this.visible = false;
- this.$nextTick(() => {
- this.visible = true;
- this.refreshChange();
- });
- },
- },
+
data() {
return {
visible: true,
@@ -100,18 +88,18 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/equipage/import-equipage",
+ action: "/api/equipage/import-equipage"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
loading: true,
@@ -120,7 +108,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query: {},
data: [],
@@ -138,21 +126,24 @@
column: column,
...this.$store.state.control.clearOtherBut,
labelWidth: 110,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
- useifid: 266,
+ useifid: 266
};
},
computed: {
...mapGetters(["userInfo"]),
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
created() {
if (this.windowHeight) {
@@ -203,10 +194,11 @@
done();
},
handleTemplate() {
- window.open(`/api/equipage/export-template?${
- this.website.tokenHeader
- }=${getToken()}`
- );
+ window.open(
+ `/api/equipage/export-template?${
+ this.website.tokenHeader
+ }=${getToken()}`
+ );
},
sizeChange(val) {
this.page1.currentPage = 1;
@@ -236,15 +228,15 @@
form["deptId"] = this.useifid;
}
adddata(form).then(
- (res) => {
+ res => {
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -277,11 +269,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -291,7 +283,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -300,7 +292,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -315,7 +307,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -324,7 +316,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec.toggleSelection();
});
@@ -374,15 +366,16 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
// console.log(res);
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
- console.log(this.data);
+ this.$store.commit("setWindowSizeHeightAdd");
+ // console.log(this.data);
this.loading = false;
});
- },
+ }
},
mounted() {
// this.Ourdata = data;
@@ -391,7 +384,7 @@
// var dept_id = JSON.parse(
// window.localStorage.getItem("saber-userInfo")
// ).content.dept_id;
- },
+ }
};
</script>
@@ -410,4 +403,4 @@
// .el-tag--light {
// padding: 0 !important;
// }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/securityEquipment/gun.vue b/src/views/securityEquipment/gun.vue
index 5f48086..c6a780f 100644
--- a/src/views/securityEquipment/gun.vue
+++ b/src/views/securityEquipment/gun.vue
@@ -1,64 +1,64 @@
<template>
- <basic-container>
- <div
- :class="[
- 'equipments',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'equipments',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec"
+ @on-load="onLoad"
+ :table-loading="loading"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
>
- <avue-crud
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec"
- @on-load="onLoad"
- :table-loading="loading"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport"
+ >批量导入
+ </el-button>
+ </template>
+ </avue-crud>
+ <el-dialog
+ title="枪支导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
>
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete"
- >删 除
- </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport"
- >批量导入
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
</el-button>
</template>
- </avue-crud>
- <el-dialog
- title="枪支导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px"
- >
- <avue-form
- :option="excelOption"
- v-model="excelForm"
- :upload-after="uploadAfter"
- >
- <template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
- 点击下载<i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog>
- </div>
+ </avue-form>
+ </el-dialog>
</basic-container>
</template>
@@ -86,18 +86,18 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/gun/import-gun?deptId=" + this.deptIds,
+ action: "/api/gun/import-gun?deptId=" + this.deptIds
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
deptIds: "",
selectionList: [],
@@ -105,7 +105,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query: {},
data: [],
@@ -122,20 +122,20 @@
selection: true,
labelWidth: 110,
column: column,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
- useifid: 266,
+ useifid: 266
};
},
computed: {
...mapGetters(["userInfo"]),
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
created() {
var that = this;
@@ -157,7 +157,8 @@
"/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697";
}
},
- mounted(){
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
this.deptIds = this.userInfo.dept_id;
},
methods: {
@@ -171,10 +172,9 @@
done();
},
handleTemplate() {
- window.open(`/api/gun/export-template-gun?${
- this.website.tokenHeader
- }=${getToken()}`
- );
+ window.open(
+ `/api/gun/export-template-gun?${this.website.tokenHeader}=${getToken()}`
+ );
},
sizeChange(val) {
this.page1.currentPage = 1;
@@ -194,15 +194,15 @@
form["deptId"] = this.useifid;
}
adddata(form).then(
- (res) => {
+ res => {
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -231,11 +231,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -245,7 +245,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -254,7 +254,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -269,7 +269,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -278,7 +278,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec.toggleSelection();
});
@@ -325,7 +325,10 @@
params["jurisdiction"] = that.userInfo.jurisdiction;
}
//保安公司进入
- if (this.userInfo.role_name == "保安公司管理员" || this.userInfo.role_name == "分公司管理员") {
+ if (
+ this.userInfo.role_name == "保安公司管理员" ||
+ this.userInfo.role_name == "分公司管理员"
+ ) {
params["deptId"] = that.userInfo.dept_id;
//导入action 修改
const importColumn = that.findObject(
@@ -339,14 +342,15 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
+ this.$store.commit("setWindowSizeHeightAdd");
// console.log(this.data);
this.loading = false;
});
- },
+ }
},
mounted() {
// this.Ourdata = data;
@@ -355,7 +359,7 @@
// var dept_id = JSON.parse(
// window.localStorage.getItem("saber-userInfo")
// ).content.dept_id;
- },
+ }
};
</script>
@@ -374,4 +378,4 @@
// .el-tag--light {
// padding: 0 !important;
// }
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/securityGuard/data.js b/src/views/securityGuard/data.js
index f7c35f5..e550b62 100644
--- a/src/views/securityGuard/data.js
+++ b/src/views/securityGuard/data.js
@@ -1,316 +1,314 @@
//保安员基本信息
export var securityBaseInfoColumn = [{
- label: "",
- labelWidth: "20",
- type: 'title',
- prop: "title",
- span: 24,
- styles: {
- fontSize: '24px'
- }
- },
- {
- label: "企业名称",
- prop: "deptId",
- type: "tree",
- dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
- props: {
- label: "title",
- value: "id",
- },
- disabled: true,
- span: 24,
- },
- {
- label: "登录账号",
- prop: "account",
- disabled: true
- },
- {
- label: "用户姓名",
- prop: "realName",
- disabled: true,
- },
- {
- label: "用户昵称",
- prop: "name",
- disabled: true
- },
- {
- label: "手机号码",
- prop: "phone",
- disabled: true
- },
- {
- label: "电子邮箱",
- prop: "email",
- disabled: true
- },
- {
- label: "身份证号",
- prop: "cardid",
- disabled: true
- },
- {
- label: "籍贯",
- prop: "nativeplace",
- disabled: true
- },
- {
- label: "民族",
- prop: "nation",
- disabled: true
- },
- {
- label: "是否持证",
- prop: "hold",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
- props: {
- label: "dictValue",
- value: "dictKey",
- },
- type: "select",
- disabled: true
- },
- {
- label: "保安员证编号",
- prop: "securitynumber",
- disabled: true
- },
- {
- label: "所属辖区",
- prop: "jurisdiction",
- // multiple: true,
- type: "tree",
- dicUrl: "/api/jurisdiction/lazy-tree",
- props: {
- label: "title",
- value: "id",
- },
- disabled: true
- },
- {
- label: "最高学历",
- prop: "education",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- disabled: true
- },
- {
- label: "政治面貌",
- prop: "politicaloutlook",
- disabled: true
- },
- {
- label: "身高",
- prop: "height",
- disabled: true
- },
- {
- label: "联系地址",
- prop: "address",
- disabled: true
- },
- {
- label: "户口所在地",
- prop: "registered",
- disabled: true
- },
- {
- label: "入职时间",
- prop: "rtime",
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- disabled: true
- },
- {
- label: "用户性别",
- prop: "sex",
- type: "select",
- dicData: [{
- label: "男",
- value: 1
- },
- {
- label: "女",
- value: 2
- },
- {
- label: "未知",
- value: 3
- }
- ],
- disabled: true
- },
- {
- label: "用户生日",
- type: "date",
- prop: "birthday",
- disabled: true
+ label: "",
+ labelWidth: "20",
+ type: "title",
+ prop: "title",
+ span: 24,
+ styles: {
+ fontSize: "24px"
}
-
-
-]
-
+ },
+ {
+ label: "企业名称",
+ prop: "deptId",
+ type: "tree",
+ dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ // dicUrl: "/api/blade-system/dept/lazy-tree?parentId=0",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ disabled: true,
+ span: 24
+ },
+ {
+ label: "登录账号",
+ prop: "account",
+ disabled: true
+ },
+ {
+ label: "用户姓名",
+ prop: "realName",
+ disabled: true
+ },
+ {
+ label: "用户昵称",
+ prop: "name",
+ disabled: true
+ },
+ {
+ label: "手机号码",
+ prop: "phone",
+ disabled: true
+ },
+ {
+ label: "电子邮箱",
+ prop: "email",
+ disabled: true
+ },
+ {
+ label: "身份证号",
+ prop: "cardid",
+ disabled: true
+ },
+ {
+ label: "籍贯",
+ prop: "nativeplace",
+ disabled: true
+ },
+ {
+ label: "民族",
+ prop: "nation",
+ disabled: true
+ },
+ {
+ label: "是否持证",
+ prop: "hold",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=equipage",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ type: "select",
+ disabled: true
+ },
+ {
+ label: "保安员证编号",
+ prop: "securitynumber",
+ disabled: true
+ },
+ {
+ label: "所属辖区",
+ prop: "jurisdiction",
+ // multiple: true,
+ type: "tree",
+ dicUrl: "/api/jurisdiction/lazy-tree",
+ props: {
+ label: "title",
+ value: "id"
+ },
+ disabled: true
+ },
+ {
+ label: "最高学历",
+ prop: "education",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
+ },
+ dataType: "number",
+ slot: true,
+ disabled: true
+ },
+ {
+ label: "政治面貌",
+ prop: "politicaloutlook",
+ disabled: true
+ },
+ {
+ label: "身高",
+ prop: "height",
+ disabled: true
+ },
+ {
+ label: "联系地址",
+ prop: "address",
+ disabled: true
+ },
+ {
+ label: "户口所在地",
+ prop: "registered",
+ disabled: true
+ },
+ {
+ label: "入职时间",
+ prop: "rtime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ disabled: true
+ },
+ {
+ label: "用户性别",
+ prop: "sex",
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 2
+ },
+ {
+ label: "未知",
+ value: 3
+ }
+ ],
+ disabled: true
+ },
+ {
+ label: "用户生日",
+ type: "date",
+ prop: "birthday",
+ disabled: true
+ }
+];
export var securityBaseInfoColumns = [{
- label: "所属保安单位",
- prop: "tenantId",
- type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
- props: {
- label: "tenantName",
- value: "tenantId"
- },
- disabled: true,
- span: 24,
+ label: "所属保安单位",
+ prop: "tenantId",
+ type: "tree",
+ dicUrl: "/api/blade-system/tenant/select",
+ props: {
+ label: "tenantName",
+ value: "tenantId"
},
- {
- label: "登录账号",
- prop: "account",
- disabled: true
+ disabled: true,
+ span: 24
+ },
+ {
+ label: "登录账号",
+ prop: "account",
+ disabled: true
+ },
+ {
+ label: "用户姓名",
+ prop: "realName",
+ rules: [{
+ required: true,
+ message: "请输入用户姓名",
+ trigger: "blur"
+ },
+ {
+ min: 2,
+ max: 5,
+ message: "姓名长度在2到5个字符"
+ }
+ ]
+ },
+ {
+ label: "用户昵称",
+ prop: "name"
+ },
+ {
+ label: "手机号码",
+ prop: "phone",
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请输入手机号",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "电子邮箱",
+ prop: "email",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "身份证号",
+ prop: "cardid",
+ hide: true,
+ overHidden: true,
+ rules: [{
+ required: true,
+ message: "请输入身份证号",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "籍贯",
+ prop: "nativeplace",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "民族",
+ prop: "nation",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "最高学历",
+ prop: "education",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
},
- {
- label: "用户姓名",
- prop: "realName",
- rules: [{
- required: true,
- message: "请输入用户姓名",
- trigger: "blur"
- }, {
- min: 2,
- max: 5,
- message: '姓名长度在2到5个字符'
- }]
- },
- {
- label: "用户昵称",
- prop: "name"
- },
- {
- label: "手机号码",
- prop: "phone",
- overHidden: true,
- rules: [{
- required: true,
- message: "请输入手机号",
- trigger: "blur"
- }]
- },
- {
- label: "电子邮箱",
- prop: "email",
- hide: true,
- overHidden: true
- },
- {
- label: "身份证号",
- prop: "cardid",
- hide: true,
- overHidden: true,
- rules: [{
- required: true,
- message: "请输入身份证号",
- trigger: "blur"
- }]
- },
- {
- label: "籍贯",
- prop: "nativeplace",
- hide: true,
- overHidden: true
- },
- {
- label: "民族",
- prop: "nation",
- hide: true,
- overHidden: true
- },
- {
- label: "最高学历",
- prop: "education",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- slot: true,
- rules: [{
- required: true,
- message: "请选择学历",
- trigger: "blur"
- }]
- },
- {
- label: "政治面貌",
- prop: "politicaloutlook",
- hide: true,
- overHidden: true
- },
- {
- label: "身高",
- prop: "height",
- hide: true,
- overHidden: true
- },
- {
- label: "联系地址",
- prop: "address",
- hide: true,
- overHidden: true
- },
- {
- label: "户口所在地",
- prop: "registered",
- hide: true,
- overHidden: true
- },
- {
- label: "入职时间",
- prop: "rtime",
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- hide: true,
- overHidden: true
- },
- {
- label: "用户性别",
- prop: "sex",
- type: "select",
- dicData: [{
- label: "男",
- value: 1
- },
- {
- label: "女",
- value: 2
- },
- {
- label: "未知",
- value: 3
- }
- ],
- hide: true
- },
- {
- label: "用户生日",
- type: "date",
- prop: "birthday",
- hide: true
- }
-]
-
+ dataType: "number",
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择学历",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "政治面貌",
+ prop: "politicaloutlook",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "身高",
+ prop: "height",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "联系地址",
+ prop: "address",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "户口所在地",
+ prop: "registered",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "入职时间",
+ prop: "rtime",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ hide: true,
+ overHidden: true
+ },
+ {
+ label: "用户性别",
+ prop: "sex",
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 2
+ },
+ {
+ label: "未知",
+ value: 3
+ }
+ ],
+ hide: true
+ },
+ {
+ label: "用户生日",
+ type: "date",
+ prop: "birthday",
+ hide: true
+ }
+];
//从业记录
export var practitionersColumn = [{
@@ -319,499 +317,517 @@
hide: true,
editDisplay: false,
addDisplay: false
-}, {
- label: '企业名称',
+ },
+ {
+ label: "企业名称",
prop: "companyname",
formslot: true,
rules: [{
- required: true,
- message: "请选择企业名称",
- trigger: "blur"
+ required: true,
+ message: "请选择企业名称",
+ trigger: "blur"
}]
-}, {
- label: '部门',
+ },
+ {
+ label: "部门",
prop: "department",
- formslot: true,
-}, {
- label: '岗位',
+ formslot: true
+ },
+ {
+ label: "岗位",
prop: "post",
- formslot: true,
-}, {
- label: '岗位职责',
+ formslot: true
+ },
+ {
+ label: "岗位职责",
prop: "responsibilities",
- formslot: true,
-}, {
- label: '入职时间',
- type: 'date',
+ formslot: true
+ },
+ {
+ label: "入职时间",
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
prop: "entrytime",
formslot: true,
rules: [{
- required: true,
- message: "请选择入职时间",
- trigger: "blur"
+ required: true,
+ message: "请选择入职时间",
+ trigger: "blur"
}]
-}, {
- label: '离职时间',
- type: 'date',
+ },
+ {
+ label: "离职时间",
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
prop: "departuretime",
formslot: true,
rules: [{
- required: true,
- message: "请选择离职时间",
- trigger: "blur"
+ required: true,
+ message: "请选择离职时间",
+ trigger: "blur"
}]
-}, {
- label: '离职原因',
+ },
+ {
+ label: "离职原因",
prop: "leaving",
- formslot: true,
-}]
+ formslot: true
+ }
+];
export var practitionersColumns = [{
width: 200,
- label: '企业名称',
+ label: "企业名称",
prop: "companyname",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '部门',
+ label: "部门",
prop: "department",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '岗位',
+ label: "岗位",
prop: "post",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '岗位职责',
+ label: "岗位职责",
prop: "responsibilities",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '入职时间',
- type: 'date',
+ label: "入职时间",
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
prop: "entryTime",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '离职时间',
- type: 'date',
+ label: "离职时间",
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
prop: "departureTime",
- formslot: true,
-}, {
+ formslot: true
+ },
+ {
width: 200,
- label: '离职原因',
+ label: "离职原因",
prop: "leaving",
- formslot: true,
-}]
+ formslot: true
+ }
+];
//表现
export var trackRecordColumn = [{
- label: "id",
- prop: "id",
- hide: true,
- editDisplay: false,
- addDisplay: false
- }, {
- label: '时间',
- type: 'date',
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- prop: "time",
- formslot: true,
- },
- // {
- // label: '工作态度',
- // prop: "workingattitude",
- // formslot: true,
+ label: "id",
+ prop: "id",
+ hide: true,
+ editDisplay: false,
+ addDisplay: false
+ },
+ {
+ label: "时间",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ prop: "time",
+ formslot: true
+ },
+ // {
+ // label: '工作态度',
+ // prop: "workingattitude",
+ // formslot: true,
+ // },
+ {
+ label: "工作表现",
+ prop: "achievements",
+ formslot: true
+ },
+ {
+ label: "表现评定",
+ prop: "score",
+ type: "select",
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
// },
- {
- label: '工作表现',
- prop: "achievements",
- formslot: true,
- }, {
- label: '表现评定',
- prop: "score",
- type: "select",
- // dicUrl: "/api/blade-system/dict-biz/dictionary?code=scoreType",
- // props: {
- // label: "dictValue",
- // value: "dictKey"
- // },
- dicData: [{
- label: "优秀",
- value: 0
- },
- {
- label: "良好",
- value: 1
- },
- {
- label: "一般",
- value: 2
- },
- {
- label: "差",
- value: 3
- },
- ],
- dataType: "number",
- slot: true,
- rules: [{
- required: true,
- message: "请选择表现",
- trigger: "blur"
- }]
- }
- // {
- // label: '服务公司',
- // prop: "departmentName",
- // formslot: true,
- // }
-]
-
+ dicData: [{
+ label: "优秀",
+ value: 0
+ },
+ {
+ label: "良好",
+ value: 1
+ },
+ {
+ label: "一般",
+ value: 2
+ },
+ {
+ label: "差",
+ value: 3
+ }
+ ],
+ dataType: "number",
+ slot: true,
+ rules: [{
+ required: true,
+ message: "请选择表现",
+ trigger: "blur"
+ }]
+ }
+ // {
+ // label: '服务公司',
+ // prop: "departmentName",
+ // formslot: true,
+ // }
+];
export var securityFormPageColumn = [{
- label: "姓名",
- prop: "realName",
- search: true,
- searchSpan: 3,
- width: 65,
- searchLabelWidth: 50,
- display: false
+ label: "姓名",
+ prop: "realName",
+ search: true,
+ searchSpan: 3,
+ width: 65,
+ searchLabelWidth: 50,
+ display: false
+ },
+ {
+ label: "企业名称",
+ searchLabelWidth: 75,
+ // prop: "deptName",
+ prop: "deptId",
+ type: "tree",
+ // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
+ props: {
+ label: "title",
+ value: "id"
},
- {
- label: "企业名称",
- searchLabelWidth: "80",
- // prop: "deptName",
- prop: "deptId",
- type: "tree",
- // dicUrl: "/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
- props: {
- label: "title",
- value: "id",
- },
- // hide: true,
- slot: true,
- searchSpan: 5,
- display: false,
- search: true,
- minWidth: 160
- },
- {
- label: "性别",
- prop: "sexs",
- sortable: true,
- width: 75,
- type: "select",
- dicData: [{
- label: "男",
- value: 1,
- },
- {
- label: "女",
- value: 2,
- },
- // {
- // label: "未知",
- // value: 3,
- // },
- ],
- display: false
- },
- {
- label: "身份证号码",
- prop: "cardid",
- search: true,
- searchLabelWidth: 90,
- searchSpan: 4,
- width: 140,
- display: false
- },
- {
- label: "照片",
- prop: "avatar",
- type: "upload",
- listType: "picture-img",
- width: 60,
- display: false
- },
- {
- label: "籍贯",
- prop: "nativeplace",
- hide: true,
- display: false
- },
- {
- label: "民族",
- prop: "nation",
- hide: true,
- width: 55,
- display: false
- },
- {
- label: "出生日期",
- prop: "birthday",
- type: "date",
- format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
- display: false,
- hide: true,
- },
- {
- label: "年龄",
- prop: "age",
- width: 55,
+ // hide: true,
+ slot: true,
+ searchSpan: 5,
+ display: false,
+ search: true,
+ minWidth: 160
+ },
+ {
+ label: "性别",
+ prop: "sexs",
+ sortable: true,
+ width: 75,
+ type: "select",
+ dicData: [{
+ label: "男",
+ value: 1
+ },
+ {
+ label: "女",
+ value: 2
+ }
+ // {
+ // label: "未知",
+ // value: 3,
+ // },
+ ],
+ display: false
+ },
+ {
+ label: "身份证号码",
+ prop: "cardid",
+ search: true,
+ searchLabelWidth: 90,
+ searchSpan: 4,
+ width: 164,
+ display: false
+ },
+ {
+ label: "照片",
+ prop: "avatar",
+ type: "upload",
+ listType: "picture-img",
+ width: 60,
+ display: false
+ },
+ {
+ label: "籍贯",
+ prop: "nativeplace",
+ hide: true,
+ display: false
+ },
+ {
+ label: "民族",
+ prop: "nation",
+ hide: true,
+ width: 55,
+ display: false
+ },
+ {
+ label: "出生日期",
+ prop: "birthday",
+ type: "date",
+ format: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd",
+ display: false,
+ hide: true
+ },
+ {
+ label: "年龄",
+ prop: "age",
+ width: 55,
- display: false
- },
- // {
- // label: "学历",
- // prop: "education",
- // display: false,
- // width: 90,
- // dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
- // props: {
- // label: "dictValue",
- // value: "dictKey"
- // },
- // type: "select",
- // // hide: true,
- // rules: [{
- // required: true,
- // message: "请选择学历",
- // trigger: "blur"
- // }],
- // },
- {
- label: "联系电话",
- prop: "phone",
- minWidth: 80,
- display: false
- },
- {
- label: "健康状态",
- prop: "healstats",
- hide: true,
- display: false
- },
- {
- label: "保安证编号",
- prop: "securitynumber",
- search: true,
- searchLabelWidth: 90,
- sortable: true,
- width: 118,
- searchSpan: 4,
- addDisplay: false,
- editDisplay: false,
- // hide: true,
- },
- {
- label: "入职时间",
- prop: "rtime",
- hide: true,
- display: false
- },
- {
- label: '是否派遣',
- prop: 'dispatch',
- type: 'select',
- sortable: true,
- editDisplay: false,
- search: true,
- width: 110,
- searchSpan: 3,
- addDisplay: false,
- dicData: [{
- label: '全部',
- value: '2'
- },
- {
- label: '已派遣',
- value: '0'
- },
- {
- label: '未派遣',
- value: '1'
- }
- ]
- },
- {
- label: "是否持证",
- prop: "hold",
- slot: true,
- sortable: true,
- search: true,
- searchSpan: 3,
- width: 110,
- type: "select",
- dicData: [{
- label: "是",
- value: "1",
- },
- {
- label: "否",
- value: "2",
- },
- {
- label: "已吊销",
- value: "3",
- },
- ],
- display: false,
- rules: [{
- required: true,
- message: "请选择",
- trigger: "blur"
- }],
- },
+ display: false
+ },
+ // {
+ // label: "学历",
+ // prop: "education",
+ // display: false,
+ // width: 90,
+ // dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationType",
+ // props: {
+ // label: "dictValue",
+ // value: "dictKey"
+ // },
+ // type: "select",
+ // // hide: true,
+ // rules: [{
+ // required: true,
+ // message: "请选择学历",
+ // trigger: "blur"
+ // }],
+ // },
+ {
+ label: "联系电话",
+ prop: "phone",
+ minWidth: 108,
+ display: false
+ },
+ {
+ label: "健康状态",
+ prop: "healstats",
+ hide: true,
+ display: false
+ },
+ {
+ label: "保安证编号",
+ prop: "securitynumber",
+ search: true,
+ searchLabelWidth: 90,
+ sortable: true,
+ width: 123,
+ searchSpan: 4,
+ addDisplay: false,
+ editDisplay: false
+ // hide: true,
+ },
+ {
+ label: "入职时间",
+ prop: "rtime",
+ hide: true,
+ display: false
+ },
+ {
+ label: "是否派遣",
+ prop: "dispatch",
+ type: "select",
+ sortable: true,
+ editDisplay: false,
+ searchLabelWidth: 75,
+ search: true,
+ width: 110,
+ searchSpan: 3,
+ addDisplay: false,
+ dicData: [{
+ label: "全部",
+ value: "2"
+ },
+ {
+ label: "已派遣",
+ value: "0"
+ },
+ {
+ label: "未派遣",
+ value: "1"
+ }
+ ]
+ },
+ {
+ label: "是否持证",
+ prop: "hold",
+ slot: true,
+ sortable: true,
+ searchLabelWidth: 75,
+ search: true,
+ searchSpan: 3,
+ width: 110,
+ type: "select",
+ dicData: [{
+ label: "是",
+ value: "1"
+ },
+ {
+ label: "否",
+ value: "2"
+ },
+ {
+ label: "已吊销",
+ value: "3"
+ }
+ ],
+ display: false,
+ rules: [{
+ required: true,
+ message: "请选择",
+ trigger: "blur"
+ }]
+ },
- {
- label: "是否制证",
- prop: "userType",
- type: "select",
- sortable: true,
- slot: true,
- search: true,
- // searchValue: 7,
- editDisplay: false,
- addDisplay: false,
- searchSpan: 3,
- width: 110,
- dicData: [{
- label: "已制证",
- value: 6,
- },
- {
- label: "未制证",
- value: 7,
- }
- ],
- },
+ {
+ label: "是否制证",
+ prop: "userType",
+ type: "select",
+ sortable: true,
+ slot: true,
+ search: true,
+ // searchValue: 7,
+ editDisplay: false,
+ addDisplay: false,
+ searchSpan: 3,
+ width: 110,
+ dicData: [{
+ label: "已制证",
+ value: 6
+ },
+ {
+ label: "未制证",
+ value: 7
+ }
+ ]
+ },
- // {
- // label: "发证日期",
- // prop: "papertime",
- // type: "date",
- // format: "yyyy-MM-dd",
- // valueFormat: "yyyy-MM-dd",
- // // searchRange: true,
- // // searchSpan: 6,
- // // hide: true,
- // // addDisplay: false,
- // // editDisplay: false,
- // // viewDisplay: false,
- // // search: true,
- // // rules: [{
- // // required: true,
- // // message: "请输入时间",
- // // trigger: "blur"
- // // }]
- // },
- {
- label: "有无照片",
- prop: "isAvatar",
- type: "select",
- search: true,
- minWidth: 105,
- searchSpan: 3,
- addDisplay: false,
- editDisplay: false,
- hide: true,
- display: false,
- dicData: [{
- label: "全部",
- value: 3,
- },
- {
- label: "有",
- value: 1,
- },
- {
- label: "无",
- value: 2,
- },
- ],
+ // {
+ // label: "发证日期",
+ // prop: "papertime",
+ // type: "date",
+ // format: "yyyy-MM-dd",
+ // valueFormat: "yyyy-MM-dd",
+ // // searchRange: true,
+ // // searchSpan: 6,
+ // // hide: true,
+ // // addDisplay: false,
+ // // editDisplay: false,
+ // // viewDisplay: false,
+ // // search: true,
+ // // rules: [{
+ // // required: true,
+ // // message: "请输入时间",
+ // // trigger: "blur"
+ // // }]
+ // },
+ {
+ label: "有无照片",
+ prop: "isAvatar",
+ type: "select",
+ search: true,
+ minWidth: 105,
+ searchSpan: 3,
+ addDisplay: false,
+ editDisplay: false,
+ hide: true,
+ display: false,
+ dicData: [{
+ label: "全部",
+ value: 3
+ },
+ {
+ label: "有",
+ value: 1
+ },
+ {
+ label: "无",
+ value: 2
+ }
+ ]
+ },
+ {
+ label: "是否采集指纹",
+ prop: "isFingerprint",
+ type: "select",
+ search: true,
+ searchLabelWidth: 110,
+ minWidth: 105,
+ searchSpan: 4,
+ addDisplay: false,
+ editDisplay: false,
+ hide: true,
+ display: false,
+ dicData: [{
+ label: "全部",
+ value: 3
+ },
+ {
+ label: "是",
+ value: 1
+ },
+ {
+ label: "否",
+ value: 2
+ }
+ ]
+ },
+ {
+ label: "在职状态",
+ prop: "status",
+ type: "select",
+ dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
+ props: {
+ label: "dictValue",
+ value: "dictKey"
},
- {
- label: "是否采集指纹",
- prop: "isFingerprint",
- type: "select",
- search: true,
- searchLabelWidth: 110,
- minWidth: 105,
- searchSpan: 4,
- addDisplay: false,
- editDisplay: false,
- hide: true,
- display: false,
- dicData: [{
- label: "全部",
- value: 3,
- },
- {
- label: "是",
- value: 1,
- },
- {
- label: "否",
- value: 2,
- },
- ],
- },
- {
- label: "在职状态",
- prop: "status",
- type: "select",
- dicUrl: "/api/blade-system/dict-biz/dictionary?code=workerState",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
- dataType: "number",
- searchValue: 1,
- display: false,
- hide: true,
- searchSpan: 3,
- width: 80,
- search: true,
- rules: [{
- required: true,
- message: "请选择在职状态",
- trigger: "blur"
- }]
- },
- {
- label: "审查状态",
- prop: "examinationType",
- type: "select",
- sortable: true,
- display: false,
- searchSpan: 3,
- search: true,
- hide: true,
- width: 110,
- dicData: [{
- label: "全部",
- value: 6,
- },
- {
- label: "正常",
- value: "0",
- },
- {
- label: "异常",
- value: "1",
- }
- ],
- },
-]
\ No newline at end of file
+ dataType: "number",
+ searchValue: 1,
+ display: false,
+ hide: true,
+ searchSpan: 3,
+ width: 80,
+ search: true,
+ rules: [{
+ required: true,
+ message: "请选择在职状态",
+ trigger: "blur"
+ }]
+ },
+ {
+ label: "审查状态",
+ prop: "examinationType",
+ type: "select",
+ sortable: true,
+ display: false,
+ searchSpan: 3,
+ search: true,
+ hide: true,
+ width: 110,
+ dicData: [{
+ label: "全部",
+ value: 6
+ },
+ {
+ label: "正常",
+ value: "0"
+ },
+ {
+ label: "异常",
+ value: "1"
+ }
+ ]
+ }
+];
diff --git a/src/views/securityGuard/securityGuard.vue b/src/views/securityGuard/securityGuard.vue
index 4b73a8c..d9e40ad 100644
--- a/src/views/securityGuard/securityGuard.vue
+++ b/src/views/securityGuard/securityGuard.vue
@@ -1,6 +1,6 @@
<template>
<el-row :class="{ securityGuard: isSecurity }">
- <el-col :span="0" style="display: none">
+ <!-- <el-col :span="0" style="display: none">
<div class="box">
<el-scrollbar>
<basic-container>
@@ -12,16 +12,17 @@
</basic-container>
</el-scrollbar>
</div>
- </el-col>
+ </el-col> -->
<el-col :span="24">
<basic-container
:class="[
+ screenSize == 1366 ? 'smallSize' : 'normalSize',
$store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
+ <!-- :key="option.height" -->
<avue-crud
class="tablesss"
- :key="option.height"
:option="option"
:search.sync="search"
:table-loading="loading"
@@ -157,7 +158,82 @@
</template>
<template slot-scope="{ type, size, row }" slot="menu">
- <el-button
+ <el-tooltip
+ placement="bottom"
+ effect="light"
+ transition="el-collapse-transition"
+ popper-class="caozuolanpopper"
+ >
+ <div slot="content">
+ <el-button
+ icon="el-icon-view"
+ :size="size"
+ :type="type"
+ @click.stop="rowClick(row)"
+ >查看
+ </el-button>
+ <br />
+ <el-button
+ icon="el-icon-scissors"
+ :size="size"
+ :type="type"
+ v-if="permission.securityGuard_delete && row.status != 2"
+ @click="$refs.crud.rowEdit(row, index)"
+ >编辑
+ </el-button>
+ <br v-if="permission.securityGuard_delete && row.status != 2" />
+ <el-button
+ icon="el-icon-close"
+ :size="size"
+ :type="type"
+ v-if="permission.securityGuard_delete && row.status != 2"
+ @click="$refs.crud.rowDel(row, index)"
+ >注销
+ </el-button>
+ <br v-if="permission.securityGuard_delete && row.status != 2" />
+ <el-button
+ icon="el-icon-circle-close"
+ :size="size"
+ :type="type"
+ v-if="permission.securityGuard_delete && row.status != 2"
+ @click.stop="rowStatus(row)"
+ >离职
+ </el-button>
+ <br v-if="permission.securityGuard_delete && row.status != 2" />
+ <el-button
+ icon="el-icon-search"
+ :size="size"
+ :type="type"
+ v-if="row.status == 2"
+ @click.stop="rowDellook(row)"
+ >离职查询
+ </el-button>
+ <br v-if="row.status == 2" />
+ <el-button
+ icon="el-icon-user"
+ :size="size"
+ :type="type"
+ v-if="permission.securityGuard_check"
+ @click.stop="rowCheck(row)"
+ >异常
+ </el-button>
+ <!-- <br />
+ <el-button
+ icon="el-icon-edit"
+ style="display: none"
+ :size="size"
+ :type="type"
+ v-if="permission.securityGuard_paper"
+ @click.stop="certificateClick(row)"
+ >纸质证书制作
+ </el-button> -->
+ </div>
+ <el-button icon="el-icon-s-operation" :size="size" :type="type"
+ >操作
+ </el-button>
+ </el-tooltip>
+
+ <!-- <el-button
icon="el-icon-s-custom"
:size="size"
:type="type"
@@ -196,7 +272,7 @@
v-if="permission.securityGuard_paper"
@click.stop="certificateClick(row)"
>纸质证书制作
- </el-button>
+ </el-button> -->
</template>
<template slot-scope="{ row }" slot="sex">
@@ -649,6 +725,7 @@
// // that.option.height = +h - (+heard[0].clientHeight + 332);
// let optionHeight = +this.windowHeight - (+heard[0].clientHeight + +usNum);
return {
+ startTimecc: null,
sort: "",
type: 2,
sortName: "",
@@ -824,8 +901,8 @@
delBtn: true,
align: "center",
index: true,
- delBtnText: "注销",
- menuWidth: 280,
+ // delBtnText: "注销",
+ menuWidth: 90,
selection: true,
viewBtn: true,
defaultExpandAll: true,
@@ -1319,58 +1396,10 @@
]
},
tablevisible: true,
- isNotChangeSize: true //取消表格loging
+ onceTableChange: 1
};
},
watch: {
- windowHeight() {
- let that = this;
- that.isNotChangeSize = false; //取消表格loging
- let d = {
- fn: function(h) {
- let table = document.getElementsByClassName("tablesss");
- let heard = table[0].getElementsByClassName("avue-crud__search");
- let usNum =
- that.windowWidth <= 1376 || that.windowHeight <= 778 ? 170 : 302;
- // // that.option.height = +h - (+heard[0].clientHeight + 332);
- // alert(h);
- let doit = height => {
- let hs = height || h;
- // alert(hs);
- // alert(heard[0].clientHeight);
- // alert(usNum);
- that.option.height = +hs - (+heard[0].clientHeight + +usNum);
- that.$nextTick(() => {
- that.refreshChange();
- setTimeout(() => {
- let d = {
- that: this,
- otherclass: ["downSFZ"],
- haveOpen: true
- };
- //刷新表格后再次调整按钮
- that.$store.dispatch("TABLE_CHANGEBUTPOSITION", d);
- that.isNotChangeSize = true; //恢复表格loging
- }, 10);
- });
- };
- if (that.option.height == "auto") {
- //解决第一次未渲染成功会报错的问题
- setTimeout(() => {
- // console.log(
- // document
- // .getElementsByClassName("tablesss")[0]
- // .getElementsByClassName("avue-crud__search")
- // );
- doit(window.innerHeight);
- }, 150);
- } else {
- doit();
- }
- }
- };
- this.$store.dispatch("WHchangeHight", d);
- },
radio() {
if (this.radio) {
this.SFZloding = true;
@@ -1500,7 +1529,14 @@
}
},
computed: {
- ...mapGetters(["userInfo", "permission", "windowHeight", "windowWidth"]),
+ ...mapGetters([
+ "userInfo",
+ "permission",
+ "windowHeight",
+ "windowWidth",
+ "screenSize",
+ "screenHeight"
+ ]),
permissionList() {
return {
addBtn: this.vaildData(this.permission.securityGuard_add, false),
@@ -1588,15 +1624,11 @@
}
},
mounted() {
- // let d = {
- // that: this,
- // otherclass: ["downSFZ"],
- // haveOpen: true,
- // flowHeight: 332,
- // };
- // this.$store.dispatch("TABLE_CHANGEBUTPOSITION", d);
- // console.log((this.$refs.crud._props.option.height = 200));
- this.changeButsPosition("TABLE_CHANGEBUTPOSITION");
+ // console.log(this.screenSize, "screenSize");
+ this.option.height = this.screenHeight;
+ this.$store.commit("setWindowSizeHeightAdd");
+ // this.$store.dispatch("MOUNTED_TABLE_SIZE");
+
// this.option.column[0].hide = true
// 非保安单位模式默认加载管理组数据
if (!website.tenantMode) {
@@ -1639,17 +1671,6 @@
}
// 首次执行
checkDom();
- },
- changeButsPosition(val) {
- let d = {
- that: this,
- otherclass: ["downSFZ"],
- haveOpen: true,
- from: "mounted"
- };
- // 开始就适应高度
- this.$store.commit("setWindowSizeHeightAdd");
- this.$store.dispatch("TABLE_CHANGEBUTPOSITION", d);
},
openccc() {
console.log(this.zhiwenImg);
@@ -1840,10 +1861,18 @@
this.userInfo.account == "南昌市保安服务总公司" ||
this.userInfo.account == "押运分公司"
) {
- window.open(`/api/blade-user/export-template-securityYy?${this.website.tokenHeader}=${getToken()}`);
+ window.open(
+ `/api/blade-user/export-template-securityYy?${
+ this.website.tokenHeader
+ }=${getToken()}`
+ );
return;
}
- window.open(`/api/blade-user/export-template-security?${this.website.tokenHeader}=${getToken()}`);
+ window.open(
+ `/api/blade-user/export-template-security?${
+ this.website.tokenHeader
+ }=${getToken()}`
+ );
},
handleImport2() {
this.excelBox2 = true;
@@ -2752,6 +2781,7 @@
that.data = data.records;
that.loading = false;
that.selectionClear();
+ that.$store.commit("setWindowSizeHeightAdd");
});
});
});
@@ -3099,7 +3129,7 @@
.downSFZqudong {
position: absolute;
right: 239px;
- top: 153px;
+ top: 93px;
font-size: 14px;
a {
text-decoration: underline;
diff --git a/src/views/securityUnit/localCompany.vue b/src/views/securityUnit/localCompany.vue
index 98f35dd..92fb9c7 100644
--- a/src/views/securityUnit/localCompany.vue
+++ b/src/views/securityUnit/localCompany.vue
@@ -1,72 +1,72 @@
<template>
- <basic-container>
- <div
- :class="[
- 'securityUnit',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'securityUnit',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec"
+ @on-load="onLoad"
+ :table-loading="loading"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
>
- <avue-crud
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec"
- @on-load="onLoad"
- :table-loading="loading"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
- >
- <!-- @row-click="rowClick" -->
- <template slot-scope="{ row }" slot="znum">
- <el-tag
- class="rowClickSelf"
- @click="rowClickSelf(row)"
- title="点击查看保安人员情况"
- >{{ row.znum }}</el-tag
- >
- </template>
+ <!-- @row-click="rowClick" -->
+ <template slot-scope="{ row }" slot="znum">
+ <el-tag
+ class="rowClickSelf"
+ @click="rowClickSelf(row)"
+ title="点击查看保安人员情况"
+ >{{ row.znum }}</el-tag
+ >
+ </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- icon="el-icon-s-custom"
- :size="size"
- :type="type"
- @click.stop="rowClick(row)"
- >查看
- </el-button>
- <el-button
- :size="size"
- :type="type"
- @click="handleUploadPage(row)"
- icon="el-icon-circle-check"
- >附件上传
- </el-button>
- </template>
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete"
- >删 除
- </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport1"
- >批量导入
- </el-button>
- </template>
- </avue-crud>
- </div>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="el-icon-s-custom"
+ :size="size"
+ :type="type"
+ @click.stop="rowClick(row)"
+ >查看
+ </el-button>
+ <el-button
+ :size="size"
+ :type="type"
+ @click="handleUploadPage(row)"
+ icon="el-icon-circle-check"
+ >附件上传
+ </el-button>
+ </template>
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport1"
+ >批量导入
+ </el-button>
+ </template>
+ </avue-crud>
<el-dialog
title="保安单位导入"
append-to-body
@@ -93,7 +93,7 @@
getdata,
adddata,
update,
- remove,
+ remove
} from "@/api/securityUnit/securityUnit";
import { mapGetters } from "vuex";
import { getJurisdictionTree } from "@/api/jurisdiction/jurisdiction";
@@ -115,18 +115,18 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/information/import-informaton",
+ action: "/api/information/import-informaton"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
loading: true, //保安单位基本信息
selectionList: [],
@@ -134,7 +134,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
treeData: [],
treeOption: {
@@ -149,16 +149,16 @@
column: [
{
label: "自定义项",
- prop: "label",
- },
- ],
+ prop: "label"
+ }
+ ]
},
props: {
labelText: "标题",
label: "title",
value: "id",
- children: "children",
- },
+ children: "children"
+ }
},
forms: false,
data0: {},
@@ -194,10 +194,10 @@
{
required: true,
message: "请选择企业名称",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
- overHidden: true,
+ overHidden: true
},
{
label: "所属辖区",
@@ -211,16 +211,16 @@
// nodeKey: "id",
props: {
label: "title",
- value: "id",
+ value: "id"
},
rules: [
{
required: false,
message: "请选择所属辖区",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
- overHidden: true,
+ overHidden: true
},
{
label: "法定代表人",
@@ -232,9 +232,9 @@
{
required: false,
message: "请输入法定代表人",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "法定代表人电话",
@@ -246,21 +246,21 @@
{
required: false,
message: "请输入法定代表人电话",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "联系人",
prop: "contacts",
labelWidth: 145,
- hide: true,
+ hide: true
},
{
label: "联系电话",
prop: "contactscell",
labelWidth: 145,
- hide: true,
+ hide: true
},
{
label: "保安人数",
@@ -273,7 +273,7 @@
editDisplay: false,
viewDisabled: false,
viewDisplay: false,
- searchLabelWidth: 100,
+ searchLabelWidth: 100
},
{
label: "派遣人数",
@@ -286,7 +286,7 @@
viewDisabled: false,
viewDisplay: false,
searchSpan: 4,
- searchLabelWidth: 100,
+ searchLabelWidth: 100
},
{
label: "持证人数",
@@ -299,7 +299,7 @@
viewDisabled: false,
viewDisplay: false,
searchSpan: 4,
- searchLabelWidth: 100,
+ searchLabelWidth: 100
},
{
label: "企业属性",
@@ -310,22 +310,22 @@
dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
rules: [
{
required: true,
message: "请选择企业属性",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "注册地址",
prop: "address",
labelWidth: 145,
// search: true,
- hide: true,
+ hide: true
},
{
label: "注册时间",
@@ -352,22 +352,24 @@
{
required: false,
message: "请选择注册时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
- label: "办公地址",
- prop: "industry",
- span: 12,
- labelWidth: 145,
- disabled: false,
- hide:true,
- rules: [{
- required: false,
- message: "请选择办公地址",
- trigger: "blur",
- }, ],
+ label: "办公地址",
+ prop: "industry",
+ span: 12,
+ labelWidth: 145,
+ disabled: false,
+ hide: true,
+ rules: [
+ {
+ required: false,
+ message: "请选择办公地址",
+ trigger: "blur"
+ }
+ ]
},
{
label: "登记机关",
@@ -376,11 +378,11 @@
labelWidth: 145,
// width: 88,
overHidden: true,
- hide: true,
- },
+ hide: true
+ }
],
- ...this.$store.state.control.clearOtherBut,
- },
+ ...this.$store.state.control.clearOtherBut
+ }
};
},
created() {
@@ -388,7 +390,7 @@
column.value = "2";
column.editDisabled = true;
column.addDisabled = true;
- if(this.userInfo.role_name == "administrator" ){
+ if (this.userInfo.role_name == "administrator") {
column.editDisabled = false;
column.addDisabled = false;
}
@@ -398,20 +400,23 @@
...mapGetters(["userInfo"]),
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.creditcode);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
//获取辖区数据
getJurisdictionTree() {
- getJurisdictionTree().then((res) => {
+ getJurisdictionTree().then(res => {
const column = this.findObject(this.option.column, "jurisdiction");
column.dicData = res.data.data;
column.defaultExpandedKeys = [];
- res.data.data.forEach((item) => {
+ res.data.data.forEach(item => {
column.defaultExpandedKeys.push(item.id);
});
});
@@ -419,7 +424,7 @@
rowClickSelf(val) {
this.$router.push({
path: "/securityGuardOnce/index",
- query: { departmentid: val.departmentid },
+ query: { departmentid: val.departmentid }
});
},
handleImport1() {
@@ -432,10 +437,11 @@
done();
},
handleTemplate1() {
- window.open(`/api/examSubjectChoices/export-template?${
- this.website.tokenHeader
- }=${getToken()}&`
- );
+ window.open(
+ `/api/examSubjectChoices/export-template?${
+ this.website.tokenHeader
+ }=${getToken()}&`
+ );
},
//保安单位基本信息
sizeChange(val) {
@@ -450,11 +456,11 @@
},
rowSave(form, done, loading) {
form["createUserId"] = this.userInfo.Id;
- adddata(form).then((res) => {
+ adddata(form).then(res => {
if (res.data.success) {
this.$message({
message: "操作成功",
- type: "success",
+ type: "success"
});
this.refreshChange();
done();
@@ -462,7 +468,7 @@
} else {
this.$message({
message: "操作失败",
- type: "warning",
+ type: "warning"
});
done();
}
@@ -487,11 +493,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -503,7 +509,7 @@
{
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}
)
.then(() => {
@@ -514,7 +520,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -529,10 +535,10 @@
this.$confirm("确定批量将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
- return remove(this.ids, this.ids1).then((res) => {
+ return remove(this.ids, this.ids1).then(res => {
this.refreshChange();
});
})
@@ -540,11 +546,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec.toggleSelection();
})
- .catch((res) => {});
+ .catch(res => {});
},
refreshChange() {
this.onLoad(this.page, this.query);
@@ -554,7 +560,7 @@
var data = JSON.stringify(row);
this.$router.push({
path: "/securityUnitChild",
- query: { data: data },
+ query: { data: data }
});
},
//跳转到附近列表页面
@@ -563,8 +569,8 @@
path: `/resource/attachCopy`,
query: {
deptId: row.departmentid,
- enterprisename: row.enterprisename,
- },
+ enterprisename: row.enterprisename
+ }
});
},
onLoad(page, params = {}) {
@@ -578,17 +584,18 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
window.localStorage.setItem("danweidataS", JSON.stringify(this.data));
- console.log(this.data);
+ // console.log(this.data);
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading = false;
});
- },
+ }
},
- mounted() {},
+ mounted() {}
};
</script>
diff --git a/src/views/securityUnit/securityTraining.vue b/src/views/securityUnit/securityTraining.vue
index 71bc162..80fe0c5 100644
--- a/src/views/securityUnit/securityTraining.vue
+++ b/src/views/securityUnit/securityTraining.vue
@@ -1,72 +1,72 @@
<template>
- <basic-container>
- <div
- :class="[
- 'securityUnit',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'securityUnit',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec"
+ @on-load="onLoad"
+ :table-loading="loading"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
>
- <avue-crud
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec"
- @on-load="onLoad"
- :table-loading="loading"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
- >
- <!-- @row-click="rowClick" -->
- <template slot-scope="{ row }" slot="znum">
- <el-tag
- class="rowClickSelf"
- @click="rowClickSelf(row)"
- title="点击查看保安人员情况"
- >{{ row.znum }}</el-tag
- >
- </template>
+ <!-- @row-click="rowClick" -->
+ <template slot-scope="{ row }" slot="znum">
+ <el-tag
+ class="rowClickSelf"
+ @click="rowClickSelf(row)"
+ title="点击查看保安人员情况"
+ >{{ row.znum }}</el-tag
+ >
+ </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- icon="el-icon-s-custom"
- :size="size"
- :type="type"
- @click.stop="rowClick(row)"
- >查看
- </el-button>
- <el-button
- :size="size"
- :type="type"
- @click="handleUploadPage(row)"
- icon="el-icon-circle-check"
- >附件上传
- </el-button>
- </template>
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete"
- >删 除
- </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport1"
- >批量导入
- </el-button>
- </template>
- </avue-crud>
- </div>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="el-icon-s-custom"
+ :size="size"
+ :type="type"
+ @click.stop="rowClick(row)"
+ >查看
+ </el-button>
+ <el-button
+ :size="size"
+ :type="type"
+ @click="handleUploadPage(row)"
+ icon="el-icon-circle-check"
+ >附件上传
+ </el-button>
+ </template>
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport1"
+ >批量导入
+ </el-button>
+ </template>
+ </avue-crud>
<el-dialog
title="保安单位导入"
append-to-body
@@ -93,7 +93,7 @@
getdata,
adddata,
update,
- remove,
+ remove
} from "@/api/securityUnit/securityUnit";
import { mapGetters } from "vuex";
import { getToken } from "@/util/auth";
@@ -114,18 +114,18 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/information/import-informaton",
+ action: "/api/information/import-informaton"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
loading: true, //保安单位基本信息
selectionList: [],
@@ -133,7 +133,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
treeData: [],
treeOption: {
@@ -148,16 +148,16 @@
column: [
{
label: "自定义项",
- prop: "label",
- },
- ],
+ prop: "label"
+ }
+ ]
},
props: {
labelText: "标题",
label: "title",
value: "id",
- children: "children",
- },
+ children: "children"
+ }
},
forms: false,
noshehuibianma: 0,
@@ -189,10 +189,10 @@
{
required: true,
message: "请选择企业名称",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
- overHidden: true,
+ overHidden: true
},
{
label: "所属辖区",
@@ -204,16 +204,16 @@
dicUrl: "/api//jurisdiction/lazy-trees",
props: {
label: "title",
- value: "id",
+ value: "id"
},
rules: [
{
required: false,
message: "请选择所属辖区",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
- overHidden: true,
+ overHidden: true
},
{
label: "法定代表人",
@@ -225,9 +225,9 @@
{
required: false,
message: "请输入法定代表人",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "法定代表人电话",
@@ -239,21 +239,21 @@
{
required: false,
message: "请输入法定代表人电话",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "联系人",
prop: "contacts",
labelWidth: 145,
- hide: true,
+ hide: true
},
{
label: "联系电话",
prop: "contactscell",
labelWidth: 145,
- hide: true,
+ hide: true
},
{
label: "保安人数",
@@ -266,7 +266,7 @@
editDisplay: false,
viewDisabled: false,
viewDisplay: false,
- searchLabelWidth: 100,
+ searchLabelWidth: 100
},
{
label: "派遣人数",
@@ -279,7 +279,7 @@
viewDisabled: false,
viewDisplay: false,
searchSpan: 4,
- searchLabelWidth: 100,
+ searchLabelWidth: 100
},
{
label: "持证人数",
@@ -292,7 +292,7 @@
viewDisabled: false,
viewDisplay: false,
searchSpan: 4,
- searchLabelWidth: 100,
+ searchLabelWidth: 100
},
{
label: "企业属性",
@@ -303,22 +303,22 @@
dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
rules: [
{
required: true,
message: "请选择企业属性",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "注册地址",
prop: "address",
labelWidth: 145,
// search: true,
- hide: true,
+ hide: true
},
{
label: "注册时间",
@@ -345,22 +345,24 @@
{
required: false,
message: "请选择注册时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
- label: "办公地址",
- prop: "industry",
- span: 12,
- labelWidth: 145,
- disabled: false,
- hide:true,
- rules: [{
- required: false,
- message: "请选择办公地址",
- trigger: "blur",
- }, ],
+ label: "办公地址",
+ prop: "industry",
+ span: 12,
+ labelWidth: 145,
+ disabled: false,
+ hide: true,
+ rules: [
+ {
+ required: false,
+ message: "请选择办公地址",
+ trigger: "blur"
+ }
+ ]
},
{
label: "登记机关",
@@ -369,11 +371,11 @@
labelWidth: 145,
// width: 88,
overHidden: true,
- hide: true,
- },
+ hide: true
+ }
],
- ...this.$store.state.control.clearOtherBut,
- },
+ ...this.$store.state.control.clearOtherBut
+ }
};
},
created() {
@@ -381,7 +383,7 @@
column.value = "1";
column.editDisabled = true;
column.addDisabled = true;
- if(this.userInfo.role_name == "administrator" ){
+ if (this.userInfo.role_name == "administrator") {
column.editDisabled = false;
column.addDisabled = false;
}
@@ -390,18 +392,21 @@
...mapGetters(["userInfo"]),
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.creditcode);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
rowClickSelf(val) {
// console.log(val.departmentid);
this.$router.push({
path: "/securityGuardOnce/index",
- query: { departmentid: val.departmentid },
+ query: { departmentid: val.departmentid }
});
},
handleImport1() {
@@ -414,10 +419,11 @@
done();
},
handleTemplate1() {
- window.open(`/api/examSubjectChoices/export-template?${
- this.website.tokenHeader
- }=${getToken()}&`
- );
+ window.open(
+ `/api/examSubjectChoices/export-template?${
+ this.website.tokenHeader
+ }=${getToken()}&`
+ );
},
//保安单位基本信息
sizeChange(val) {
@@ -434,11 +440,11 @@
},
rowSave(form, done, loading) {
form["createUserId"] = this.userInfo.Id;
- adddata(form).then((res) => {
+ adddata(form).then(res => {
if (res.data.success) {
this.$message({
message: "操作成功",
- type: "success",
+ type: "success"
});
this.refreshChange();
done();
@@ -446,7 +452,7 @@
} else {
this.$message({
message: "操作失败",
- type: "warning",
+ type: "warning"
});
done();
}
@@ -471,11 +477,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -485,7 +491,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
console.log(row);
@@ -495,7 +501,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -512,12 +518,12 @@
{
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}
)
.then(() => {
// console.log(this.ids);
- return remove(this.ids, this.ids1).then((res) => {
+ return remove(this.ids, this.ids1).then(res => {
this.refreshChange();
});
})
@@ -525,11 +531,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec.toggleSelection();
})
- .catch((res) => {});
+ .catch(res => {});
},
refreshChange() {
this.onLoad(this.page, this.query);
@@ -539,7 +545,7 @@
var data = JSON.stringify(row);
this.$router.push({
path: "/securityUnitChild",
- query: { data: data },
+ query: { data: data }
});
},
//跳转到附近列表页面
@@ -548,8 +554,8 @@
path: `/resource/attachCopy`,
query: {
deptId: row.departmentid,
- enterprisename: row.enterprisename,
- },
+ enterprisename: row.enterprisename
+ }
});
},
onLoad(page, params = {}) {
@@ -563,18 +569,18 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
window.localStorage.setItem("danweidataS", JSON.stringify(this.data));
- console.log(this.data);
+ this.$store.commit("setWindowSizeHeightAdd");
+ // console.log(this.data);
this.loading = false;
});
- },
-
+ }
},
- mounted() {},
+ mounted() {}
};
</script>
diff --git a/src/views/securityUnit/selfRecruitedSecurityGuard.vue b/src/views/securityUnit/selfRecruitedSecurityGuard.vue
index 4b41dea..d47e58d 100644
--- a/src/views/securityUnit/selfRecruitedSecurityGuard.vue
+++ b/src/views/securityUnit/selfRecruitedSecurityGuard.vue
@@ -1,72 +1,72 @@
<template>
- <basic-container>
- <div
- :class="[
- 'securityUnit',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'securityUnit',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec"
+ @on-load="onLoad"
+ :table-loading="loading"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
>
- <avue-crud
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec"
- @on-load="onLoad"
- :table-loading="loading"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
- >
- <!-- @row-click="rowClick" -->
- <template slot-scope="{ row }" slot="znum">
- <el-tag
- class="rowClickSelf"
- @click="rowClickSelf(row)"
- title="点击查看保安人员情况"
- >{{ row.znum }}</el-tag
- >
- </template>
+ <!-- @row-click="rowClick" -->
+ <template slot-scope="{ row }" slot="znum">
+ <el-tag
+ class="rowClickSelf"
+ @click="rowClickSelf(row)"
+ title="点击查看保安人员情况"
+ >{{ row.znum }}</el-tag
+ >
+ </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- icon="el-icon-s-custom"
- :size="size"
- :type="type"
- @click.stop="rowClick(row)"
- >查看
- </el-button>
- <el-button
- :size="size"
- :type="type"
- @click="handleUploadPage(row)"
- icon="el-icon-circle-check"
- >附件上传
- </el-button>
- </template>
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete"
- >删 除
- </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport1"
- >批量导入
- </el-button>
- </template>
- </avue-crud>
- </div>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="el-icon-s-custom"
+ :size="size"
+ :type="type"
+ @click.stop="rowClick(row)"
+ >查看
+ </el-button>
+ <el-button
+ :size="size"
+ :type="type"
+ @click="handleUploadPage(row)"
+ icon="el-icon-circle-check"
+ >附件上传
+ </el-button>
+ </template>
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport1"
+ >批量导入
+ </el-button>
+ </template>
+ </avue-crud>
<el-dialog
title="保安单位导入"
append-to-body
@@ -94,7 +94,7 @@
getdata,
adddata,
update,
- remove,
+ remove
} from "@/api/securityUnit/securityUnit";
import { mapGetters } from "vuex";
import { getToken } from "@/util/auth";
@@ -115,18 +115,18 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/information/import-informaton",
+ action: "/api/information/import-informaton"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
loading: true, //保安单位基本信息
@@ -135,7 +135,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
treeData: [],
@@ -151,16 +151,16 @@
column: [
{
label: "自定义项",
- prop: "label",
- },
- ],
+ prop: "label"
+ }
+ ]
},
props: {
labelText: "标题",
label: "title",
value: "id",
- children: "children",
- },
+ children: "children"
+ }
},
forms: false,
data0: {},
@@ -197,10 +197,10 @@
{
required: true,
message: "请选择企业名称",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
- overHidden: true,
+ overHidden: true
},
{
label: "所属辖区",
@@ -212,67 +212,67 @@
dicUrl: "/api//jurisdiction/lazy-trees",
props: {
label: "title",
- value: "id",
+ value: "id"
},
rules: [
{
required: false,
message: "请选择所属辖区",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
- overHidden: true,
+ overHidden: true
},
{
label: "联系人",
prop: "contacts",
labelWidth: 110,
- hide: false,
+ hide: false
},
{
label: "联系电话",
prop: "contactscell",
labelWidth: 110,
- hide: false,
+ hide: false
},
{
label: "保安人数",
labelWidth: 110,
prop: "znum",
searchSpan: 4,
- addDisabled:false,
- addDisplay:false,
- editDisabled:false,
- editDisplay:false,
- viewDisabled:false,
- viewDisplay:false,
- searchLabelWidth: 100,
+ addDisabled: false,
+ addDisplay: false,
+ editDisabled: false,
+ editDisplay: false,
+ viewDisabled: false,
+ viewDisplay: false,
+ searchLabelWidth: 100
},
{
label: "派遣人数",
labelWidth: 110,
prop: "pnum",
- addDisabled:false,
- addDisplay:false,
- editDisabled:false,
- editDisplay:false,
- viewDisabled:false,
- viewDisplay:false,
+ addDisabled: false,
+ addDisplay: false,
+ editDisabled: false,
+ editDisplay: false,
+ viewDisabled: false,
+ viewDisplay: false,
searchSpan: 4,
- searchLabelWidth: 100,
+ searchLabelWidth: 100
},
{
label: "持证人数",
labelWidth: 110,
prop: "cnum",
- addDisabled:false,
- addDisplay:false,
- editDisabled:false,
- editDisplay:false,
- viewDisabled:false,
- viewDisplay:false,
+ addDisabled: false,
+ addDisplay: false,
+ editDisabled: false,
+ editDisplay: false,
+ viewDisabled: false,
+ viewDisplay: false,
searchSpan: 4,
- searchLabelWidth: 100,
+ searchLabelWidth: 100
},
{
label: "企业属性",
@@ -283,22 +283,22 @@
dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
rules: [
{
required: true,
message: "请选择企业属性",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "注册地址",
prop: "address",
labelWidth: 110,
// search: true,
- hide: true,
+ hide: true
},
{
label: "注册时间",
@@ -325,14 +325,14 @@
{
required: true,
message: "请选择注册时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "服务区域",
labelWidth: 110,
- prop: "fregion",
+ prop: "fregion"
},
{
label: "服务时间",
@@ -340,7 +340,7 @@
prop: "ftime",
type: "date",
format: "yyyy-MM-dd",
- valueFormat: "yyyy-MM-dd",
+ valueFormat: "yyyy-MM-dd"
},
{
label: "登记机关",
@@ -349,17 +349,16 @@
labelWidth: 110,
// width: 88,
overHidden: true,
- hide: true,
- },
-
- ],
- },
+ hide: true
+ }
+ ]
+ }
};
},
created() {
const column = this.findObject(this.option.column, "stats");
column.value = "0";
- if(this.userInfo.role_name=="培训公司管理员"){
+ if (this.userInfo.role_name == "培训公司管理员") {
column.editDisabled = true;
column.addDisabled = true;
}
@@ -368,18 +367,21 @@
...mapGetters(["userInfo"]),
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.creditcode);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
rowClickSelf(val) {
// console.log(val.departmentid);
this.$router.push({
path: "/securityGuardOnce/index",
- query: { departmentid: val.departmentid },
+ query: { departmentid: val.departmentid }
});
},
handleImport1() {
@@ -392,10 +394,11 @@
done();
},
handleTemplate1() {
- window.open(`/api/examSubjectChoices/export-template?${
- this.website.tokenHeader
- }=${getToken()}&`
- );
+ window.open(
+ `/api/examSubjectChoices/export-template?${
+ this.website.tokenHeader
+ }=${getToken()}&`
+ );
},
//保安单位基本信息
sizeChange(val) {
@@ -409,11 +412,11 @@
},
rowSave(form, done, loading) {
form["createUserId"] = this.userInfo.Id;
- adddata(form).then((res) => {
+ adddata(form).then(res => {
if (res.data.success) {
this.$message({
message: "操作成功",
- type: "success",
+ type: "success"
});
this.refreshChange();
done();
@@ -421,7 +424,7 @@
} else {
this.$message({
message: "操作失败",
- type: "warning",
+ type: "warning"
});
done();
}
@@ -445,11 +448,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -459,7 +462,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
console.log(row);
@@ -469,7 +472,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -486,12 +489,12 @@
{
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}
)
.then(() => {
// console.log(this.ids);
- return remove(this.ids, this.ids1).then((res) => {
+ return remove(this.ids, this.ids1).then(res => {
this.refreshChange();
});
})
@@ -499,11 +502,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec.toggleSelection();
})
- .catch((res) => {});
+ .catch(res => {});
},
refreshChange() {
this.onLoad(this.page, this.query);
@@ -513,7 +516,7 @@
var data = JSON.stringify(row);
this.$router.push({
path: "/securityUnitChild",
- query: { data: data },
+ query: { data: data }
});
},
//跳转到附近列表页面
@@ -522,8 +525,8 @@
path: `/resource/attachCopy`,
query: {
deptId: row.departmentid,
- enterprisename: row.enterprisename,
- },
+ enterprisename: row.enterprisename
+ }
});
},
onLoad(page, params = {}) {
@@ -539,15 +542,16 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
window.localStorage.setItem("danweidataS", JSON.stringify(this.data));
- console.log(this.data);
+ this.$store.commit("setWindowSizeHeightAdd");
+ // console.log(this.data);
this.loading = false;
});
- },
+ }
},
watch: {
haveID() {
@@ -563,9 +567,9 @@
},
havedata() {
console.log(this.havedata, "qqqqq");
- },
+ }
},
- mounted() {},
+ mounted() {}
};
</script>
diff --git a/src/views/securityUnit/transRegionalcompany.vue b/src/views/securityUnit/transRegionalcompany.vue
index bea6445..36942b3 100644
--- a/src/views/securityUnit/transRegionalcompany.vue
+++ b/src/views/securityUnit/transRegionalcompany.vue
@@ -1,73 +1,73 @@
<template>
- <basic-container>
- <div
- :class="[
- 'securityUnit',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'securityUnit',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss"
+ :option="option"
+ :data="data"
+ :page.sync="page"
+ ref="crudrec"
+ @on-load="onLoad"
+ :table-loading="loading"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @row-update="rowUpdate"
+ @row-del="rowDel"
+ @selection-change="selectionChange"
+ @refresh-change="refreshChange"
>
- <avue-crud
- :option="option"
- :data="data"
- :page.sync="page"
- ref="crudrec"
- @on-load="onLoad"
- :table-loading="loading"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @row-update="rowUpdate"
- @row-del="rowDel"
- @selection-change="selectionChange"
- @refresh-change="refreshChange"
- >
- <!-- @row-click="rowClick" -->
+ <!-- @row-click="rowClick" -->
- <template slot-scope="{ row }" slot="znum">
- <el-tag
- class="rowClickSelf"
- @click="rowClickSelf(row)"
- title="点击查看保安人员情况"
- >{{ row.znum }}</el-tag
- >
- </template>
+ <template slot-scope="{ row }" slot="znum">
+ <el-tag
+ class="rowClickSelf"
+ @click="rowClickSelf(row)"
+ title="点击查看保安人员情况"
+ >{{ row.znum }}</el-tag
+ >
+ </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- icon="el-icon-s-custom"
- :size="size"
- :type="type"
- @click.stop="rowClick(row)"
- >查看
- </el-button>
- <el-button
- :size="size"
- :type="type"
- @click="handleUploadPage(row)"
- icon="el-icon-circle-check"
- >附件上传
- </el-button>
- </template>
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete"
- >删 除
- </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport1"
- >批量导入
- </el-button>
- </template>
- </avue-crud>
- </div>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ icon="el-icon-s-custom"
+ :size="size"
+ :type="type"
+ @click.stop="rowClick(row)"
+ >查看
+ </el-button>
+ <el-button
+ :size="size"
+ :type="type"
+ @click="handleUploadPage(row)"
+ icon="el-icon-circle-check"
+ >附件上传
+ </el-button>
+ </template>
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete"
+ >删 除
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport1"
+ >批量导入
+ </el-button>
+ </template>
+ </avue-crud>
<el-dialog
title="保安单位导入"
append-to-body
@@ -94,7 +94,7 @@
getdata,
adddata,
update,
- remove,
+ remove
} from "@/api/securityUnit/securityUnit";
import { mapGetters } from "vuex";
import { getToken } from "@/util/auth";
@@ -117,18 +117,18 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/information/import-informaton",
+ action: "/api/information/import-informaton"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
loading: true, //保安单位基本信息
selectionList: [],
@@ -136,7 +136,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
treeData: [],
treeOption: {
@@ -151,16 +151,16 @@
column: [
{
label: "自定义项",
- prop: "label",
- },
- ],
+ prop: "label"
+ }
+ ]
},
props: {
labelText: "标题",
label: "title",
value: "id",
- children: "children",
- },
+ children: "children"
+ }
},
forms: false,
noshehuibianma: 0,
@@ -191,10 +191,10 @@
{
required: true,
message: "请选择企业名称",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
- overHidden: true,
+ overHidden: true
},
{
label: "所属辖区",
@@ -206,16 +206,16 @@
dicUrl: "/api//jurisdiction/lazy-trees",
props: {
label: "title",
- value: "id",
+ value: "id"
},
rules: [
{
required: false,
message: "请选择所属辖区",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
- overHidden: true,
+ overHidden: true
},
{
label: "分公司负责人",
@@ -227,9 +227,9 @@
{
required: false,
message: "请输入分公司负责人",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "分公司负责人电话",
@@ -241,21 +241,21 @@
{
required: false,
message: "请输入分公司负责人电话",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "联系人",
prop: "contacts",
labelWidth: 145,
- hide: true,
+ hide: true
},
{
label: "联系电话",
prop: "contactscell",
labelWidth: 145,
- hide: true,
+ hide: true
},
{
label: "保安人数",
@@ -268,7 +268,7 @@
editDisplay: false,
viewDisabled: false,
viewDisplay: false,
- searchLabelWidth: 100,
+ searchLabelWidth: 100
},
{
label: "派遣人数",
@@ -281,7 +281,7 @@
viewDisabled: false,
viewDisplay: false,
searchSpan: 4,
- searchLabelWidth: 100,
+ searchLabelWidth: 100
},
{
label: "持证人数",
@@ -294,7 +294,7 @@
viewDisabled: false,
viewDisplay: false,
searchSpan: 4,
- searchLabelWidth: 100,
+ searchLabelWidth: 100
},
{
label: "企业属性",
@@ -305,22 +305,22 @@
dicUrl: "/api/blade-system/dict-biz/dictionary?code=stats",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
rules: [
{
required: true,
message: "请选择企业属性",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "注册地址",
prop: "address",
labelWidth: 145,
// search: true,
- hide: true,
+ hide: true
},
{
label: "注册时间",
@@ -347,22 +347,24 @@
{
required: false,
message: "请选择注册时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
- label: "办公地址",
- prop: "industry",
- span: 12,
- labelWidth: 145,
- disabled: false,
- hide:true,
- rules: [{
- required: false,
- message: "请选择办公地址",
- trigger: "blur",
- }, ],
+ label: "办公地址",
+ prop: "industry",
+ span: 12,
+ labelWidth: 145,
+ disabled: false,
+ hide: true,
+ rules: [
+ {
+ required: false,
+ message: "请选择办公地址",
+ trigger: "blur"
+ }
+ ]
},
{
label: "登记机关",
@@ -371,11 +373,11 @@
labelWidth: 145,
// width: 88,
overHidden: true,
- hide: true,
- },
+ hide: true
+ }
],
- ...this.$store.state.control.clearOtherBut,
- },
+ ...this.$store.state.control.clearOtherBut
+ }
};
},
created() {
@@ -383,7 +385,7 @@
column.value = "4";
column.editDisabled = true;
column.addDisabled = true;
- if(this.userInfo.role_name == "administrator" ){
+ if (this.userInfo.role_name == "administrator") {
column.editDisabled = false;
column.addDisabled = false;
}
@@ -392,17 +394,20 @@
...mapGetters(["userInfo"]),
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.creditcode);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
rowClickSelf(val) {
this.$router.push({
path: "/securityGuardOnce/index",
- query: { departmentid: val.departmentid },
+ query: { departmentid: val.departmentid }
});
},
handleImport1() {
@@ -415,10 +420,11 @@
done();
},
handleTemplate1() {
- window.open(`/api/examSubjectChoices/export-template?${
- this.website.tokenHeader
- }=${getToken()}&`
- );
+ window.open(
+ `/api/examSubjectChoices/export-template?${
+ this.website.tokenHeader
+ }=${getToken()}&`
+ );
},
//保安单位基本信息
sizeChange(val) {
@@ -432,11 +438,11 @@
},
rowSave(form, done, loading) {
form["createUserId"] = this.userInfo.Id;
- adddata(form).then((res) => {
+ adddata(form).then(res => {
if (res.data.success) {
this.$message({
message: "操作成功",
- type: "success",
+ type: "success"
});
this.refreshChange();
done();
@@ -444,7 +450,7 @@
} else {
this.$message({
message: "操作成功",
- type: "warning",
+ type: "warning"
});
done();
}
@@ -469,11 +475,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -483,7 +489,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
console.log(row);
@@ -493,7 +499,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -510,12 +516,12 @@
{
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}
)
.then(() => {
// console.log(this.ids);
- return remove(this.ids, this.ids1).then((res) => {
+ return remove(this.ids, this.ids1).then(res => {
this.refreshChange();
});
})
@@ -523,11 +529,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec.toggleSelection();
})
- .catch((res) => {});
+ .catch(res => {});
},
refreshChange() {
this.onLoad(this.page, this.query);
@@ -537,7 +543,7 @@
var data = JSON.stringify(row);
this.$router.push({
path: "/securityUnitChild",
- query: { data: data },
+ query: { data: data }
});
},
//跳转到附近列表页面
@@ -546,8 +552,8 @@
path: `/resource/attachCopy`,
query: {
deptId: row.departmentid,
- enterprisename: row.enterprisename,
- },
+ enterprisename: row.enterprisename
+ }
});
},
onLoad(page, params = {}) {
@@ -561,15 +567,16 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
window.localStorage.setItem("danweidataS", JSON.stringify(this.data));
- console.log(this.data);
+ this.$store.commit("setWindowSizeHeightAdd");
+ // console.log(this.data);
this.loading = false;
});
- },
+ }
},
watch: {
haveID() {
@@ -585,9 +592,9 @@
},
havedata() {
console.log(this.havedata, "qqqqq");
- },
+ }
},
- mounted() {},
+ mounted() {}
};
</script>
diff --git a/src/views/securityUnitChild/index copy.vue b/src/views/securityUnitChild/index copy.vue
index 2b56522..b27db3e 100644
--- a/src/views/securityUnitChild/index copy.vue
+++ b/src/views/securityUnitChild/index copy.vue
@@ -142,102 +142,102 @@
<!-- </span> -->
</el-tab-pane>
<!-- <span v-else-if="typeTABS.prop === 'tab2'" class="tab"> -->
-
+
<el-tab-pane
:label="tab2label"
name="tab2"
:class="[
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : ''
]"
>
<div class="manager">
- <basic-container>
- <avue-crud
- v-if="true"
- :option="option1"
- :data="data1"
- :page.sync="page1"
- ref="crudrec1"
- :table-loading="loading1"
- @row-save="rowSave1"
- @search-change="searchChange1"
- @search-reset="searchReset1"
- @row-update="rowUpdate1"
- @row-del="rowDel1"
- @selection-change="selectionChange1"
- @refresh-change="refreshChange1"
- @on-load="onLoad1"
- >
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete1"
- >删 除
- </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport"
- >批量导入
- </el-button>
- </template>
- </avue-crud>
- </basic-container>
- </div>
+ <basic-container>
+ <avue-crud
+ v-if="true"
+ :option="option1"
+ :data="data1"
+ :page.sync="page1"
+ ref="crudrec1"
+ :table-loading="loading1"
+ @row-save="rowSave1"
+ @search-change="searchChange1"
+ @search-reset="searchReset1"
+ @row-update="rowUpdate1"
+ @row-del="rowDel1"
+ @selection-change="selectionChange1"
+ @refresh-change="refreshChange1"
+ @on-load="onLoad1"
+ >
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete1"
+ >删 除
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport"
+ >批量导入
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
+ </div>
<!-- </span> -->
</el-tab-pane>
-
+
<!-- <span v-else-if="typeTABS.prop === 'tab3'" class="tab"> -->
<el-tab-pane
label="主要管理人员信息"
name="tab3"
:class="[
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : ''
]"
>
<div class="manager">
- <basic-container>
- <avue-crud
- v-if="true"
- :option="option2"
- :data="data2"
- :page.sync="page2"
- ref="crudrec2"
- :table-loading="loading2"
- @row-save="rowSave2"
- @search-change="searchChange2"
- @search-reset="searchReset2"
- @row-update="rowUpdate2"
- @row-del="rowDel2"
- @selection-change="selectionChange2"
- @refresh-change="refreshChange2"
- @on-load="onLoad2"
- >
- <template slot="menuLeft">
- <el-button
- type="danger"
- size="small"
- plain
- icon="el-icon-delete"
- @click="handleDelete2"
- >删 除
- </el-button>
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- @click="handleImport1"
- >批量导入
- </el-button>
- </template>
- </avue-crud>
- </basic-container>
+ <basic-container>
+ <avue-crud
+ v-if="true"
+ :option="option2"
+ :data="data2"
+ :page.sync="page2"
+ ref="crudrec2"
+ :table-loading="loading2"
+ @row-save="rowSave2"
+ @search-change="searchChange2"
+ @search-reset="searchReset2"
+ @row-update="rowUpdate2"
+ @row-del="rowDel2"
+ @selection-change="selectionChange2"
+ @refresh-change="refreshChange2"
+ @on-load="onLoad2"
+ >
+ <template slot="menuLeft">
+ <el-button
+ type="danger"
+ size="small"
+ plain
+ icon="el-icon-delete"
+ @click="handleDelete2"
+ >删 除
+ </el-button>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ @click="handleImport1"
+ >批量导入
+ </el-button>
+ </template>
+ </avue-crud>
+ </basic-container>
</div>
<!-- </span> -->
</el-tab-pane>
@@ -326,7 +326,7 @@
</avue-form>
</el-dialog>
</div>
-</template>
+</template>
<script>
import { column11, column, column1, column2 } from "./data";
@@ -340,7 +340,7 @@
getdataOnce2,
adddata2,
update2,
- remove2,
+ remove2
} from "@/api/securityUnit/securityUnit";
import equipments from "../securityEquipment/equipments.vue";
import car from "../securityEquipment/car.vue";
@@ -358,11 +358,11 @@
gun: gun,
licence: licence,
businessLicense: businessLicense,
- social: social,
+ social: social
},
data() {
return {
- tab2label:"",
+ tab2label: "",
visible: false,
overzb: false, //结决id传入、信息获取的优先级
overcar: false, //结决id传入、信息获取的优先级
@@ -384,18 +384,18 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/shareholder/import-share",
+ action: "/api/shareholder/import-share"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
excelBox1: false, //管理人
@@ -413,18 +413,18 @@
loadText: "文件上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/member/import-member",
+ action: "/api/member/import-member"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
typeTABS: {}, //标签页
@@ -433,32 +433,32 @@
{
// icon: "el-icon-info",
label: "保安单位基本信息",
- prop: "tab1",
+ prop: "tab1"
},
{
// icon: "el-icon-info",
label: "工商信息",
- prop: "tab11",
+ prop: "tab11"
},
{
// icon: "el-icon-info",
label: "保安单位出资人员",
- prop: "tab2",
+ prop: "tab2"
},
{
// icon: "el-icon-info",
label: "主要管理人员信息",
- prop: "tab3",
+ prop: "tab3"
},
{
// icon: "el-icon-info",
label: "装备管理 ",
- prop: "tab4",
+ prop: "tab4"
},
{
// icon: "el-icon-info",
label: "车辆管理 ",
- prop: "tab5",
+ prop: "tab5"
},
// {
// // icon: "el-icon-info",
@@ -468,19 +468,19 @@
{
// icon: "el-icon-info",
label: "社保记录 ",
- prop: "tab9",
+ prop: "tab9"
},
{
// icon: "el-icon-info",
label: "营业执照 ",
- prop: "tab7",
+ prop: "tab7"
},
{
// icon: "el-icon-info",
label: "许可证 ",
- prop: "tab8",
- },
- ],
+ prop: "tab8"
+ }
+ ]
},
//全局单位统一社会信用代码
@@ -494,7 +494,7 @@
submitBtn: false,
submitText: "保存",
gutter: 30,
- column: column,
+ column: column
},
option01: {
@@ -502,7 +502,7 @@
submitBtn: false,
submitText: "保存",
gutter: 30,
- column: column11,
+ column: column11
},
loading1: true, //派遣记录
@@ -511,7 +511,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query1: {},
data1: [],
@@ -525,7 +525,7 @@
align: "center",
selection: true,
...this.$store.state.control.clearOtherBut,
- column: column1,
+ column: column1
},
loading2: true, //派遣记录
@@ -534,7 +534,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query2: {},
data2: [],
@@ -549,8 +549,8 @@
align: "center",
selection: true,
...this.$store.state.control.clearOtherBut,
- column: column2,
- },
+ column: column2
+ }
};
},
computed: {
@@ -567,18 +567,18 @@
// },
ids1() {
let ids1 = [];
- this.selectionList1.forEach((ele) => {
+ this.selectionList1.forEach(ele => {
ids1.push(ele.id);
});
return ids1.join(",");
},
ids2() {
let ids2 = [];
- this.selectionList2.forEach((ele) => {
+ this.selectionList2.forEach(ele => {
ids2.push(ele.id);
});
return ids2.join(",");
- },
+ }
},
methods: {
submit0(row, done, loading) {
@@ -594,12 +594,12 @@
// this.onloads();
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.onloads();
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -707,11 +707,11 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -739,11 +739,11 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -753,7 +753,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(row.id);
@@ -762,7 +762,7 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -777,7 +777,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(this.ids1);
@@ -786,7 +786,7 @@
this.onLoad1(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec1.toggleSelection();
});
@@ -804,7 +804,7 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
// console.log(res);
const data = res.data.data;
this.page1.total = data.total;
@@ -858,11 +858,11 @@
this.onLoad2(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -888,11 +888,11 @@
this.onLoad2(this.page2);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -902,7 +902,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove2(row.id);
@@ -911,7 +911,7 @@
this.onLoad2(this.page1);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -926,7 +926,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove2(this.ids2);
@@ -935,7 +935,7 @@
this.onLoad2(this.page2);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec2.toggleSelection();
});
@@ -954,7 +954,7 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
// console.log(res);
const data = res.data.data;
this.page2.total = data.total;
@@ -974,7 +974,7 @@
},
onloads(tab) {
var that = this;
- var doit = (a) => {
+ var doit = a => {
that.typeTABS = that.optionTABS.column[0];
// if (tab) {
// that.typeTABS.prop = tab;
@@ -1034,14 +1034,14 @@
this.$store.state.tags.tagList.splice(ind, 1);
}
- var getdatas = (roleAlias) => {
+ var getdatas = roleAlias => {
var fromSecunityGuardId = that.$route.query.fromSecunityGuardId;
// var fromSecunityGuardId = that.$route.query;
if (fromSecunityGuardId != undefined || roleAlias == "保安公司管理员") {
var value = {
- departmentid: fromSecunityGuardId || that.userInfo.dept_id,
+ departmentid: fromSecunityGuardId || that.userInfo.dept_id
};
- getOncedata(value).then((res) => {
+ getOncedata(value).then(res => {
// console.log(res.data.data, "get");
window.localStorage.setItem(
"danweidata",
@@ -1058,8 +1058,8 @@
// console.log(this.userInfo, "userInfo");
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
+ roleIds.forEach(roleId => {
+ getRoleDetail(roleId).then(res => {
var roleAlias = res.data.data.roleAlias;
var d = that.option0.column;
var e = that.option01.column;
@@ -1092,56 +1092,37 @@
});
},
//数据初始化
- initData(){
+ initData() {
var role_name = this.userInfo.role_name;
var data = this.$route.query.data;
var deptId = this.$route.query.data.departmentid;
- console.log(this.$route.query,1111111);
+ console.log(this.$route.query, 1111111);
//1.判断进入的入口，单位信息进入，单位列表查看进入
- if(deptId){
+ if (deptId) {
//2.1 单位信息进入
//判断人员角色
- if(role_name=="公安管理员" || role_name=="administrator"){
- //3.1 判断按进入的公司类型
- if(data.state=="2"){
- //本市保安公司，对应的tab 条数
-
- }
+ if (role_name == "公安管理员" || role_name == "administrator") {
+ //3.1 判断按进入的公司类型
+ if (data.state == "2") {
+ //本市保安公司，对应的tab 条数
+ }
}
- if(role_name=="保安公司管理员" || role_name=="分公司管理员"){
- //3.2 判断按进入的公司类型
+ if (role_name == "保安公司管理员" || role_name == "分公司管理员") {
+ //3.2 判断按进入的公司类型
}
-
- }else{
+ } else {
//单位列表进入
//判断人员角色
-
}
}
},
mounted() {
this.onloads();
},
- created(){
+ created() {
//初始化信息
this.initData();
- },
- watch: {
- // windowWidth() {
- // console.log(this.windowWidth, "windowWidth");
- // },
- windowHeight() {
- // console.log(this.windowHeight, "windowHeight");
- // this.option1.height = this.windowHeight + 100;
- // this.option2.height = this.windowHeight - 320;
- this.visible = false;
- this.$nextTick(() => {
- this.visible = true;
- this.refreshChange1();
- this.refreshChange2();
- });
- },
- },
+ }
};
</script>
@@ -1176,7 +1157,7 @@
top: -10px;
}
-.manager{
+.manager {
height: 755px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/securityUnitChild/index.vue b/src/views/securityUnitChild/index.vue
index 0ac876a..bb3669b 100644
--- a/src/views/securityUnitChild/index.vue
+++ b/src/views/securityUnitChild/index.vue
@@ -37,7 +37,7 @@
<!-- 出资人列表信息 -->
<el-tab-pane :label="tab2label" name="tab2" v-if="shareholderVisiable">
<shareholder
- v-if="overshareholder"
+ v-if="seeWhere == 'tab2'"
:deptid="departmentid"
:windowHeight="windowHeight"
></shareholder>
@@ -45,7 +45,7 @@
<!-- 主要管理人信息 -->
<el-tab-pane :label="managerLabel" name="tab3">
<manager
- v-if="overmanager"
+ v-if="seeWhere == 'tab3'"
:deptid="departmentid"
:stats="stats"
></manager>
@@ -53,7 +53,7 @@
<!-- 装备管理列表 -->
<el-tab-pane label="装备管理" name="tab4" v-if="equipmentVisiable">
<equipments
- v-if="overzb"
+ v-if="seeWhere == 'tab4'"
:fromDeptId="departmentid"
:windowHeight="windowHeight"
></equipments>
@@ -62,7 +62,7 @@
<el-tab-pane label="车辆管理" name="tab5" v-if="carVisiable">
<car
:fromDeptId="departmentid"
- v-if="overcar"
+ v-if="seeWhere == 'tab5'"
:windowHeight="windowHeight"
></car>
</el-tab-pane>
@@ -71,7 +71,7 @@
<social
:deptid="objBase.departmentid"
:socialRE="social"
- v-if="social"
+ v-if="seeWhere == 'tab9'"
></social>
<!-- </span> -->
</el-tab-pane>
@@ -106,7 +106,7 @@
</el-tab-pane>
</el-tabs>
</div>
-</template>
+</template>
<script>
import {
@@ -127,7 +127,7 @@
submit,
getLicenceDetail,
licenceSubmit,
- submitGroup,
+ submitGroup
} from "@/api/securityUnit/securityUnit";
import manager from "./manager.vue";
import shareholder from "./shareholder.vue";
@@ -149,7 +149,7 @@
businessLicense,
social,
manager,
- shareholder,
+ shareholder
},
data() {
return {
@@ -164,6 +164,7 @@
shareholderVisiable: true,
equipmentVisiable: true,
carVisiable: true,
+ seeWhere: "tab1",
//结决id传入、信息获取的优先级
overzb: false,
overmanager: false,
@@ -191,7 +192,7 @@
emptyBtn: false,
// submitBtn:false,
submitText: "保存",
- group: businessColumn,
+ group: businessColumn
},
licenceGroupObj: {},
licenceGroupOption: {
@@ -204,16 +205,16 @@
labelWidth: "110",
prop: "baseInfo",
icon: "el-icon-user-solid",
- column: lincenceGroupColumn,
+ column: lincenceGroupColumn
},
{
label: "分公司许可证信息",
prop: "detailInfo",
labelWidth: "110",
icon: "el-icon-s-order",
- column: lincenceGroupColumns,
- },
- ],
+ column: lincenceGroupColumns
+ }
+ ]
},
licenceObj: {},
licenceOption: {
@@ -221,29 +222,29 @@
// submitBtn: false,
submitText: "保存",
gutter: 30,
- column: lincenceColumn,
+ column: lincenceColumn
},
optionBase: {
emptyBtn: false,
submitBtn: false,
submitText: "保存",
gutter: 30,
- column: column,
+ column: column
},
option01: {
emptyBtn: false,
submitBtn: false,
submitText: "保存",
gutter: 30,
- column: column11,
- },
+ column: column11
+ }
};
},
computed: {
...mapGetters(["userInfo", "windowHeight"]),
chuzitime() {
return this.data1.capitaltime;
- },
+ }
},
methods: {
//分公司工商信息修改
@@ -262,7 +263,7 @@
establishtime: row.establishtime,
creditcode: row.creditcode,
registeredcapital: row.registeredcapital,
- business: row.business,
+ business: row.business
};
//总公司
var z = {
@@ -272,7 +273,7 @@
socialCreditCode: row.socialCreditCode,
capital: row.capital,
businessScope: row.businessScope,
- trading: row.trading,
+ trading: row.trading
};
}
@@ -281,23 +282,23 @@
() => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
);
//总公司工商信息修改
submit(z).then(
- (res) => {
+ res => {
that.businessObj = row;
that.businessObj.id = res.data.data.id;
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -331,12 +332,12 @@
() => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
that.getLicenceInfo();
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -359,12 +360,12 @@
() => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
that.formData = row;
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -395,12 +396,12 @@
() => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
that.getLicenceInfo();
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -414,20 +415,28 @@
handleClick(tab, event) {
if (tab.name == "tab1") {
this.loading1 = false;
+ this.seeWhere = "tab1";
} else if (tab.name == "tab11") {
+ this.seeWhere = "tab11";
this.obj = this.formData;
} else if (tab.name == "tab5") {
+ this.seeWhere = "tab5";
this.overcar = true;
} else if (tab.name == "tab4") {
+ this.seeWhere = "tab4";
this.overzb = true;
} else if (tab.name == "tab2") {
+ this.seeWhere = "tab2";
this.overshareholder = true;
} else if (tab.name == "tab3") {
+ this.seeWhere = "tab3";
this.overmanager = true;
} else if (tab.name == "tab9") {
+ this.seeWhere = "tab9";
this.social = true;
} else if (tab.name == "tab8") {
//获取许可证信息
+ this.seeWhere = "tab8";
this.getLicenceInfo();
} else {
this.social = false;
@@ -437,11 +446,12 @@
this.overmanager = false;
this.overshareholder = false;
}
+ this.$store.commit("setWindowSizeHeightAdd");
},
//获取许可证信息
getLicenceInfo() {
var that = this;
- getLicenceDetail(this.deptId).then((res) => {
+ getLicenceDetail(this.deptId).then(res => {
that.licenceObj = res.data.data;
});
},
@@ -470,7 +480,7 @@
if (this.stats == "1") {
//培训学校
this.licenceOption.column = lincenceTrainColumn;
- }else{
+ } else {
this.licenceOption.column = lincenceColumn;
}
@@ -478,10 +488,10 @@
if (this.stats == "4") {
//分公司
this.optionBase.column = filialeColumn;
- }else if(this.stats == "0"){
+ } else if (this.stats == "0") {
//自招保安单位
this.optionBase.column = selfColumn;
- }else{
+ } else {
//学校，本市保安公司
this.optionBase.column = column;
}
@@ -491,60 +501,60 @@
// roleIds.forEach((roleId) => {
// getRoleDetail(roleId).then((res) => {
// var roleAlias = res.data.data.roleAlias;
- var roleAlias = this.userInfo.role_name;
- var d = that.optionBase.column;
- var e = that.option01.column;
- var f = that.businessOption.group;
- var g = f[0].column;
- var h = f[1].column;
- var bb = that.licenceOption.column;
- //控制按钮，编辑状态
- if (
- roleAlias == "保安公司管理员" ||
- roleAlias == "分公司管理员" ||
- roleAlias == "培训公司管理员"
- ) {
- that.optionBase.submitBtn = true;
- that.businessOption.submitBtn = true;
- that.option01.submitBtn = true;
- that.licenceOption.submitBtn = true;
- for (var k in d) {
- d[k].disabled = false;
- }
- for (var n in e) {
- e[n].disabled = false;
- }
- for (var l in g) {
- g[l].disabled = false;
- }
- for (var m in h) {
- h[m].disabled = false;
- }
- for (var mm in bb) {
- bb[mm].disabled = false;
- }
- } else {
- that.optionBase.submitBtn = false;
- that.option01.submitBtn = false;
- that.businessOption.submitBtn = false;
- that.licenceOption.submitBtn = false;
- for (var a in d) {
- d[a].disabled = true;
- }
- for (var b in e) {
- e[b].disabled = true;
- }
- for (var c in g) {
- g[c].disabled = true;
- }
- for (var z in h) {
- h[z].disabled = true;
- }
- for (var zz in bb) {
- bb[zz].disabled = true;
- }
- }
- // });
+ var roleAlias = this.userInfo.role_name;
+ var d = that.optionBase.column;
+ var e = that.option01.column;
+ var f = that.businessOption.group;
+ var g = f[0].column;
+ var h = f[1].column;
+ var bb = that.licenceOption.column;
+ //控制按钮，编辑状态
+ if (
+ roleAlias == "保安公司管理员" ||
+ roleAlias == "分公司管理员" ||
+ roleAlias == "培训公司管理员"
+ ) {
+ that.optionBase.submitBtn = true;
+ that.businessOption.submitBtn = true;
+ that.option01.submitBtn = true;
+ that.licenceOption.submitBtn = true;
+ for (var k in d) {
+ d[k].disabled = false;
+ }
+ for (var n in e) {
+ e[n].disabled = false;
+ }
+ for (var l in g) {
+ g[l].disabled = false;
+ }
+ for (var m in h) {
+ h[m].disabled = false;
+ }
+ for (var mm in bb) {
+ bb[mm].disabled = false;
+ }
+ } else {
+ that.optionBase.submitBtn = false;
+ that.option01.submitBtn = false;
+ that.businessOption.submitBtn = false;
+ that.licenceOption.submitBtn = false;
+ for (var a in d) {
+ d[a].disabled = true;
+ }
+ for (var b in e) {
+ e[b].disabled = true;
+ }
+ for (var c in g) {
+ g[c].disabled = true;
+ }
+ for (var z in h) {
+ h[z].disabled = true;
+ }
+ for (var zz in bb) {
+ bb[zz].disabled = true;
+ }
+ }
+ // });
// });
},
//获取保安公司数据
@@ -592,9 +602,9 @@
} else {
//单位信息进入
var value = {
- departmentid: that.userInfo.dept_id,
+ departmentid: that.userInfo.dept_id
};
- getOncedata(value).then((res) => {
+ getOncedata(value).then(res => {
that.formData = res.data.data;
var stats = res.data.data.stats;
var deptId = res.data.data.departmentid;
@@ -631,7 +641,7 @@
that.businessVisiable = false;
that.licenceLabel = "总公司许可证信息";
//查询分公司（及总公司）工商信息
- getBusinessInfo(deptId).then((res) => {
+ getBusinessInfo(deptId).then(res => {
that.businessObj = res.data.data;
if (that.businessObj.id == -1) {
that.businessObj.id = null;
@@ -646,7 +656,7 @@
that.carVisiable = false;
that.shareholderVisiable = false;
}
- },
+ }
},
mounted() {
this.tagTraim();
@@ -655,7 +665,7 @@
//初始化信息
this.initData();
},
- watch: {},
+ watch: {}
};
</script>
@@ -684,4 +694,4 @@
.manager {
height: 755px;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/src/views/securityUnitChild/manager.vue b/src/views/securityUnitChild/manager.vue
index 5fec07c..22b640d 100644
--- a/src/views/securityUnitChild/manager.vue
+++ b/src/views/securityUnitChild/manager.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -69,12 +73,12 @@
getDetail2,
adddata2,
update2,
- remove2,
-} from "@/api/securityUnit/securityUnit";
+ remove2
+} from "@/api/securityUnit/securityUnit";
import { mapGetters } from "vuex";
import { getToken } from "@/util/auth";
export default {
- props: ["deptid","stats"],
+ props: ["deptid", "stats"],
data() {
var deptid = this.deptid;
if (deptid == undefined) {
@@ -91,7 +95,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -99,9 +103,9 @@
searchSize: "mini",
searchMenuSpan: 8,
height: "auto",
- editBtn:true,
- delBtn:true,
- viewBtn:true,
+ editBtn: true,
+ delBtn: true,
+ viewBtn: true,
menuWidth: 200,
menuAlign: "center",
align: "center",
@@ -113,80 +117,88 @@
prop: "creditcode",
hide: true,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
},
{
label: "id",
prop: "id",
hide: true,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
},
{
label: "姓名",
prop: "name",
search: true,
- rules: [{
+ searchLabelWidth: 55,
+ searchSpan: 4,
+ rules: [
+ {
required: true,
message: "请输入姓名",
trigger: "blur"
- }],
+ }
+ ]
},
{
label: "职务",
prop: "post",
search: true,
- rules: [{
+ rules: [
+ {
required: true,
message: "请输入职务",
trigger: "blur"
- }],
+ }
+ ]
},
{
label: "身份证",
- prop: "cardid",
+ prop: "cardid"
},
{
label: "联系电话",
- prop: "cell",
+ prop: "cell"
},
{
label: "学历",
prop: "education",
- display:false,
- row:true,
- hide:true,
- rules: [{
+ display: false,
+ row: true,
+ hide: true,
+ rules: [
+ {
required: true,
message: "请选择学历",
trigger: "blur"
- }],
+ }
+ ],
dicUrl: "/api/blade-system/dict-biz/dictionary?code=educationTypes",
search: false,
searchSpan: 4,
type: "select",
props: {
- label: "dictValue",
- value: "dictKey"
+ label: "dictValue",
+ value: "dictKey"
},
- dataType: "number",
+ dataType: "number"
},
{
label: "证书",
prop: "paper",
type: "upload",
- dataType:"string",
+ dataType: "string",
listType: "picture-card",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "只能上传jpg/png格式图片，且不超过2Mb",
action: "/api/blade-resource/oss/endpoint/put-files",
- display:false,
- hide:true,
- },
- ],
+ display: false,
+ hide: true
+ }
+ ]
},
data: [],
excelForm: {},
@@ -202,40 +214,34 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/member/import-member",
+ action: "/api/member/import-member"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
- },
+ span: 24
+ }
+ ]
+ }
};
},
created() {
this.option.height = this.windowHeight - 320;
if (this.stats == "1") {
- //学校
- const educationcolumn = this.findObject(
- this.option.column,
- "education"
- );
- const papercolumn = this.findObject(
- this.option.column,
- "paper"
- );
- //学历证书
- educationcolumn.display = true;
- educationcolumn.hide = false;
- educationcolumn.search = true;
- papercolumn.display = true;
- papercolumn.hide = false;
- }
+ //学校
+ const educationcolumn = this.findObject(this.option.column, "education");
+ const papercolumn = this.findObject(this.option.column, "paper");
+ //学历证书
+ educationcolumn.display = true;
+ educationcolumn.hide = false;
+ educationcolumn.search = true;
+ papercolumn.display = true;
+ papercolumn.hide = false;
+ }
},
computed: {
...mapGetters(["permission", "userInfo", "windowHeight"]),
@@ -249,16 +255,19 @@
// },
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
rowSave(row, done, loading) {
- row['deptId'] = this.deptid;
- if(this.stats != "1"){
+ row["deptId"] = this.deptid;
+ if (this.stats != "1") {
delete row.paper;
}
adddata2(row).then(
@@ -266,19 +275,19 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
window.console.log(error);
}
);
},
rowUpdate(row, index, done, loading) {
- row['deptId'] = this.deptid;
- if(this.stats != "1"){
+ row["deptId"] = this.deptid;
+ if (this.stats != "1") {
delete row.paper;
}
update2(row).then(
@@ -286,11 +295,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
console.log(error);
}
@@ -300,7 +309,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove2(row.id);
@@ -309,7 +318,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -335,7 +344,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove2(this.ids);
@@ -344,14 +353,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail2(this.form.id).then((res) => {
+ getDetail2(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -390,17 +399,17 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/securityUnitChild/shareholder.vue b/src/views/securityUnitChild/shareholder.vue
index c86f816..d9f321d 100644
--- a/src/views/securityUnitChild/shareholder.vue
+++ b/src/views/securityUnitChild/shareholder.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
v-if="visible"
:option="option"
:table-loading="loading"
@@ -70,7 +74,7 @@
getDetail1,
adddata1,
update1,
- remove1,
+ remove1
} from "@/api/securityUnit/securityUnit";
import { mapGetters } from "vuex";
import { getToken } from "@/util/auth";
@@ -103,7 +107,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -122,7 +126,7 @@
prop: "shareholder",
searchLabelWidth: 55,
search: true,
- labelWidth:130,
+ labelWidth: 130
},
{
label: "持股比例(%)",
@@ -131,10 +135,10 @@
{
required: true,
validator: validatePassNumber,
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- labelWidth:130,
+ labelWidth: 130
},
{
label: "出资金额(万元)",
@@ -143,10 +147,10 @@
{
required: true,
validator: validatePassNumber,
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- labelWidth:130,
+ labelWidth: 130
},
{
label: "出资时间",
@@ -154,18 +158,18 @@
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
- labelWidth:130,
+ labelWidth: 130
},
{
label: "身份证",
prop: "cardid",
search: true,
- labelWidth:130,
+ labelWidth: 130
},
{
label: "联系电话",
prop: "cell",
- labelWidth:130,
+ labelWidth: 130
},
{
label: "统一社会信用代码",
@@ -173,9 +177,9 @@
hide: true,
addDisplay: false,
editDisplay: false,
- labelWidth:130,
- },
- ],
+ labelWidth: 130
+ }
+ ]
},
data: [],
excelForm: {},
@@ -191,31 +195,20 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/shareholder/import-share",
+ action: "/api/shareholder/import-share"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
- },
+ span: 24
+ }
+ ]
+ }
};
- },
- watch: {
- windowHeight() {
- console.log(this.windowHeight);
- this.option.height = this.windowHeight - 320;
- this.visible = false;
- this.$nextTick(() => {
- this.visible = true;
- this.refreshChange();
- });
- },
},
created() {
this.option.height = this.windowHeight - 320;
@@ -232,42 +225,45 @@
// },
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
rowSave(row, done, loading) {
- row['deptId'] = this.deptid;
+ row["deptId"] = this.deptid;
adddata1(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
window.console.log(error);
}
);
},
rowUpdate(row, index, done, loading) {
- row['deptId'] = this.deptid;
+ row["deptId"] = this.deptid;
update1(row).then(
() => {
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
console.log(error);
}
@@ -277,7 +273,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(row.id);
@@ -286,13 +282,15 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
handleTemplate() {
window.open(
- `/api/shareholder/export-template?${this.website.tokenHeader}=${getToken()}`
+ `/api/shareholder/export-template?${
+ this.website.tokenHeader
+ }=${getToken()}`
);
},
uploadAfter(res, done, loading, column) {
@@ -312,7 +310,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove1(this.ids);
@@ -321,14 +319,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail1(this.form.id).then((res) => {
+ getDetail1(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -367,17 +365,17 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/securityUnitChild/social.vue b/src/views/securityUnitChild/social.vue
index 223c8a0..62109ee 100644
--- a/src/views/securityUnitChild/social.vue
+++ b/src/views/securityUnitChild/social.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
v-if="visible"
:option="option"
:table-loading="loading"
@@ -71,7 +75,7 @@
getDetail,
add,
update,
- remove,
+ remove
} from "@/api/social/social";
import { mapGetters } from "vuex";
import { getToken } from "@/util/auth";
@@ -95,7 +99,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -119,13 +123,13 @@
width: 65,
labelWidth: 110,
- change: (res) => {
+ change: res => {
this.changes(res);
},
dicUrl: "/api/blade-user/page-security-unit?deptId=" + deptid,
props: {
label: "realName",
- value: "id",
+ value: "id"
},
search: true,
searchLabelWidth: 45,
@@ -135,9 +139,9 @@
{
required: true,
message: "请输入姓名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "性别",
@@ -147,12 +151,12 @@
dicData: [
{
label: "男",
- value: 1,
+ value: 1
},
{
label: "女",
- value: 2,
- },
+ value: 2
+ }
],
labelWidth: 110,
addDisabled: true,
@@ -161,9 +165,9 @@
{
required: true,
message: "请输入性别",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
// {
// label: "民族",
@@ -209,9 +213,9 @@
{
required: true,
message: "请输入联系电话",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "身份证号",
@@ -224,9 +228,9 @@
{
required: true,
message: "请输入身份证号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "户籍所在地址",
@@ -239,9 +243,9 @@
{
required: true,
message: "请输入户籍所在地址",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
// {
// label: "居住地址 ",
@@ -280,9 +284,9 @@
{
required: true,
message: "请输入个人缴费额",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "参保时间",
@@ -296,10 +300,10 @@
{
required: true,
message: "请输入参保时间",
- trigger: "blur",
- },
- ],
- },
+ trigger: "blur"
+ }
+ ]
+ }
// {
// label: "所属机构",
// labelWidth: 110,
@@ -312,7 +316,7 @@
// value: "deptid",
// },
// },
- ],
+ ]
},
data: [],
excelForm: {},
@@ -328,19 +332,19 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/social/import-user?deptid=" + deptid,
+ action: "/api/social/import-user?deptid=" + deptid
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
- },
+ span: 24
+ }
+ ]
+ }
};
},
watch: {
@@ -358,16 +362,7 @@
socialRE() {
this.$refs.crud.refreshTable();
this.$refs.crud.doLayout();
- },
- windowHeight() {
- console.log(this.windowHeight);
- this.option.height = this.windowHeight - 320;
- this.visible = false;
- this.$nextTick(() => {
- this.visible = true;
- this.refreshChange();
- });
- },
+ }
},
created() {
this.option.height = this.windowHeight - 320;
@@ -379,21 +374,24 @@
addBtn: this.vaildData(this.permission.social_add, true),
viewBtn: this.vaildData(this.permission.social_view, false),
delBtn: this.vaildData(this.permission.social_delete, false),
- editBtn: this.vaildData(this.permission.social_edit, false),
+ editBtn: this.vaildData(this.permission.social_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
changes(val) {
if (val.value != "") {
- getuseList(val.value).then((res) => {
+ getuseList(val.value).then(res => {
// console.log(res);
var d = res.data.data;
this.form.cardid = d.cardid;
@@ -415,11 +413,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
window.console.log(error);
}
@@ -434,11 +432,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
console.log(error);
}
@@ -448,7 +446,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -457,7 +455,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -483,7 +481,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -492,14 +490,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -538,19 +536,19 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
this.$refs.crud.refreshTable();
this.$refs.crud.doLayout();
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/statisticalQueryManagement/businessStatistics.vue b/src/views/statisticalQueryManagement/businessStatistics.vue
index a630978..5c726f8 100644
--- a/src/views/statisticalQueryManagement/businessStatistics.vue
+++ b/src/views/statisticalQueryManagement/businessStatistics.vue
@@ -1,37 +1,41 @@
<template>
- <div>
- <basic-container>
- <avue-crud
- :option="tableOption"
- :table-loading="loading"
- :data="tableData"
- :page.sync="page"
- :permission="permissionList"
- ref="crud"
- :search.sync="search"
- @row-update="rowUpdates"
- @row-save="rowSave"
- @search-change="searchChange"
- @search-reset="searchReset"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- @cell-click="handleRowClick"
- class="businessStatisticsStyle"
- >
- <template slot="menuLeft">
- <el-button
- type="warning"
- size="small"
- plain
- icon="el-icon-download"
- @click="handleExportBusinessStatis"
- >导出
- </el-button>
- </template>
- </avue-crud>
- </basic-container>
+ <basic-container
+ :class="[
+ 'witerFontColorInput',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss businessStatisticsStyle"
+ :option="tableOption"
+ :table-loading="loading"
+ :data="tableData"
+ :page.sync="page"
+ :permission="permissionList"
+ ref="crud"
+ :search.sync="search"
+ @row-update="rowUpdates"
+ @row-save="rowSave"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ @cell-click="handleRowClick"
+ >
+ <template slot="menuLeft">
+ <el-button
+ type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExportBusinessStatis"
+ >导出
+ </el-button>
+ </template>
+ </avue-crud>
<el-dialog
class="tongji-class"
:title="dialogTitle"
@@ -59,13 +63,13 @@
:paramCz="paramCz"
></securityGuardDetail>
</el-dialog>
- </div>
+ </basic-container>
</template>
<script>
import { mapGetters } from "vuex";
import {
selectYw,
- dictionaryList,
+ dictionaryList
} from "@/api/statisticalQueryManagement/statisticalQueryManagement";
// import { lazyTrees } from "@/api/index/index";
import businessStatisticsDetail from "./businessStatisticsDetail";
@@ -80,7 +84,7 @@
businessStatisticsDetail,
businessStatisticsPq,
businessStatisticsFwdq,
- securityGuardDetail,
+ securityGuardDetail
},
data() {
return {
@@ -88,7 +92,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
search: {},
query: {},
@@ -112,6 +116,7 @@
indexLabel: "序号",
viewBtn: true,
dialogClickModal: false,
+ ...this.$store.state.control.clearOtherBut,
column: [
{
label: "公司名称",
@@ -119,7 +124,7 @@
search: true,
searchSpan: 4,
width: 300,
- display: false,
+ display: false
},
{
label: "单位类型",
@@ -130,9 +135,9 @@
type: "select",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
- dicData: [],
+ dicData: []
},
{
label: "所属辖区",
@@ -140,16 +145,16 @@
type: "tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
dicData: [],
rules: [
{
required: true,
message: "请选择所属辖区",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "所属辖区",
@@ -160,7 +165,7 @@
dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
hide: true,
checkStrictly: true,
@@ -169,34 +174,34 @@
{
required: false,
message: "请选择所属辖区",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "保安员人数",
prop: "znum",
- display: false,
+ display: false
},
{
label: "持证人数",
prop: "cznum",
- display: false,
+ display: false
},
{
label: "派遣人数",
prop: "pqnum",
- display: false,
+ display: false
},
{
label: "服务对象数量",
prop: "fwnum",
- display: false,
+ display: false
},
{
label: "服务到期数量",
prop: "dqnum",
- display: false,
+ display: false
},
{
label: "单位注册时间",
@@ -217,11 +222,11 @@
{
required: true,
message: "请选择单位注册时间",
- trigger: "blur",
- },
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
},
loading: true,
dialogTitle: "",
@@ -229,7 +234,7 @@
pqdialogShow: false,
fwdeptId: "",
searchitem: "",
- paramCz: false,
+ paramCz: false
};
},
computed: {
@@ -239,9 +244,9 @@
addBtn: this.vaildData(this.permission.post_add, false),
viewBtn: this.vaildData(this.permission.post_view, false),
delBtn: this.vaildData(this.permission.post_delete, false),
- editBtn: this.vaildData(this.permission.post_edit, false),
+ editBtn: this.vaildData(this.permission.post_edit, false)
};
- },
+ }
},
methods: {
//业务情况统计信息导出
@@ -249,7 +254,7 @@
this.$confirm("是否导出业务情况统计信息数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
//获取查询条件
const { releaseTimeRange } = this.search;
@@ -262,7 +267,7 @@
stats: this.search.stats,
deptid: this.search.enterpriseName,
startTime: this.search.startTime,
- endTime: this.search.endTime,
+ endTime: this.search.endTime
};
// console.log(data,123);
//序列号url形式，用&拼接
@@ -288,9 +293,9 @@
// });
},
getDictionaryList() {
- dictionaryList().then((res) => {
+ dictionaryList().then(res => {
if (res.data.code === 200) {
- this.tableOption.column.forEach((item) => {
+ this.tableOption.column.forEach(item => {
if (item.label == "单位类型") {
item.dicData = res.data.data;
}
@@ -330,21 +335,22 @@
param["size"] = page.pageSize;
const { releaseTimeRange } = this.query;
let values = {
- ...param,
+ ...param
};
if (releaseTimeRange) {
values = {
...param,
startTime: releaseTimeRange[0],
endTime: releaseTimeRange[1],
- ...this.query,
+ ...this.query
};
values.releaseTimeRange = null;
}
- selectYw(values).then((res) => {
+ selectYw(values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.tableData = data.records;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading = false;
});
},
@@ -404,12 +410,13 @@
} else {
this.dialogShow = false;
}
- },
+ }
},
mounted() {
// this.getSubOfficeData();
this.getDictionaryList();
- },
+ this.$store.commit("setWindowSizeHeightAdd");
+ }
};
</script>
<style lang="scss" scoped>
diff --git a/src/views/statisticalQueryManagement/securityGuardStatistics.vue b/src/views/statisticalQueryManagement/securityGuardStatistics.vue
index 25d3d94..f7f6760 100644
--- a/src/views/statisticalQueryManagement/securityGuardStatistics.vue
+++ b/src/views/statisticalQueryManagement/securityGuardStatistics.vue
@@ -1,36 +1,39 @@
<template>
- <div>
- <basic-container class="witerFontColorInput">
- <avue-crud
- :option="tableOption"
- :table-loading="loading"
- :data="tableData"
- :page.sync="page"
- :permission="permissionList"
- ref="crud"
- :search.sync="search"
- @search-change="searchChange"
- @search-reset="searchReset"
- @current-change="currentChange"
- @size-change="sizeChange"
- @refresh-change="refreshChange"
- @on-load="onLoad"
- @cell-click="handleRowClick"
- class="rowClick"
- >
+ <basic-container
+ :class="[
+ 'witerFontColorInput',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ class="tablesss rowClick"
+ :option="tableOption"
+ :table-loading="loading"
+ :data="tableData"
+ :page.sync="page"
+ :permission="permissionList"
+ ref="crud"
+ :search.sync="search"
+ @search-change="searchChange"
+ @search-reset="searchReset"
+ @current-change="currentChange"
+ @size-change="sizeChange"
+ @refresh-change="refreshChange"
+ @on-load="onLoad"
+ @cell-click="handleRowClick"
+ >
<template slot="menuLeft">
- <el-button
- type="warning"
- size="small"
- plain
- icon="el-icon-download"
- @click="handleExportSecurityStatisInfo"
- >导出
- </el-button>
+ <el-button
+ type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ @click="handleExportSecurityStatisInfo"
+ >导出
+ </el-button>
</template>
- </avue-crud>
-
- </basic-container>
+ </avue-crud>
<el-dialog
class="tongji-class"
:title="dialogTitle"
@@ -41,11 +44,14 @@
>
<companyDetails :fwdeptId="fwdeptId"></companyDetails>
</el-dialog>
- </div>
+ </basic-container>
</template>
<script>
import { mapGetters } from "vuex";
-import { selectLi, dictionaryList } from "@/api/statisticalQueryManagement/statisticalQueryManagement";
+import {
+ selectLi,
+ dictionaryList
+} from "@/api/statisticalQueryManagement/statisticalQueryManagement";
import companyDetails from "./companyDetails";
import Qs from "qs";
import { getToken } from "@/util/auth";
@@ -60,14 +66,13 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
- search:{},
+ search: {},
query: {},
value1: "",
value2: "",
- tableData: [
- ],
+ tableData: [],
tableOption: {
align: "center",
viewBtn: true,
@@ -84,8 +89,9 @@
searchShow: true,
searchMenuSpan: 6,
index: true,
- indexLabel:'序号',
+ indexLabel: "序号",
dialogClickModal: false,
+ ...this.$store.state.control.clearOtherBut,
column: [
{
label: "公司名称",
@@ -116,8 +122,7 @@
label: "title",
value: "value"
},
- dicData: [
- ],
+ dicData: [],
rules: [
{
required: true,
@@ -135,7 +140,7 @@
dicUrl: "/api/jurisdiction/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
hide: true,
checkStrictly: true,
@@ -144,9 +149,9 @@
{
required: false,
message: "请选择所属辖区",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "单位注册时间",
@@ -157,7 +162,7 @@
searchRange: true,
searchSpan: 6,
searchLabelWidth: 120,
- labelWidth:160,
+ labelWidth: 160,
hide: true,
addDisplay: false,
editDisplay: false,
@@ -167,9 +172,9 @@
{
required: true,
message: "请选择单位注册时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "保安员总数",
@@ -242,7 +247,7 @@
this.$confirm("是否导出保安员统计信息数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
//获取查询条件
const { releaseTimeRange } = this.search;
@@ -255,7 +260,7 @@
stats: this.search.stats,
deptid: this.search.deptname,
startTime: this.search.startTime,
- endTime: this.search.endTime,
+ endTime: this.search.endTime
};
// console.log(data,123);
//序列号url形式，用&拼接
@@ -311,21 +316,22 @@
param["size"] = page.pageSize;
const { releaseTimeRange } = this.query;
let values = {
+ ...param
+ };
+ if (releaseTimeRange) {
+ values = {
...param,
+ startTime: releaseTimeRange[0],
+ endTime: releaseTimeRange[1],
+ ...this.query
};
- if (releaseTimeRange) {
- values = {
- ...param,
- startTime: releaseTimeRange[0],
- endTime: releaseTimeRange[1],
- ...this.query,
- };
- values.releaseTimeRange = null;
- }
+ values.releaseTimeRange = null;
+ }
selectLi(values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.tableData = data.records;
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading = false;
});
},
@@ -341,6 +347,7 @@
},
mounted() {
this.getDictionaryList();
+ this.$store.commit("setWindowSizeHeightAdd");
}
};
</script>
diff --git a/src/views/system/client.vue b/src/views/system/client.vue
index fbcd6d0..acd94ac 100644
--- a/src/views/system/client.vue
+++ b/src/views/system/client.vue
@@ -1,11 +1,12 @@
<template>
<basic-container
:class="[
- 'hasButOne',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -54,7 +55,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -78,9 +79,9 @@
{
required: true,
message: "请输入客户端id",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "应用密钥",
@@ -90,9 +91,9 @@
{
required: true,
message: "请输入客户端密钥",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "授权类型",
@@ -102,32 +103,32 @@
dicData: [
{
label: "refresh_token",
- value: "refresh_token",
+ value: "refresh_token"
},
{
label: "password",
- value: "password",
+ value: "password"
},
{
label: "authorization_code",
- value: "authorization_code",
+ value: "authorization_code"
},
{
label: "captcha",
- value: "captcha",
+ value: "captcha"
},
{
label: "social",
- value: "social",
- },
+ value: "social"
+ }
],
rules: [
{
required: true,
message: "请输入授权类型",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "授权范围",
@@ -137,9 +138,9 @@
{
required: true,
message: "请输入授权范围",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "令牌秒数",
@@ -150,9 +151,9 @@
{
required: true,
message: "请输入令牌过期秒数",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "刷新秒数",
@@ -164,9 +165,9 @@
{
required: true,
message: "请输入刷新令牌过期秒数",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "回调地址",
@@ -176,9 +177,9 @@
{
required: true,
message: "请输入回调地址",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "资源集合",
@@ -187,9 +188,9 @@
rules: [
{
message: "请输入资源集合",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "权限",
@@ -198,9 +199,9 @@
rules: [
{
message: "请输入权限",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "自动授权",
@@ -209,9 +210,9 @@
rules: [
{
message: "请输入自动授权",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "附加说明",
@@ -221,13 +222,13 @@
rules: [
{
message: "请输入附加说明",
- trigger: "blur",
- },
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -237,16 +238,19 @@
addBtn: this.vaildData(this.permission.client_add),
viewBtn: this.vaildData(this.permission.client_view),
delBtn: this.vaildData(this.permission.client_delete),
- editBtn: this.vaildData(this.permission.client_edit),
+ editBtn: this.vaildData(this.permission.client_edit)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
rowSave(row, done, loading) {
@@ -255,11 +259,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -271,11 +275,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -285,7 +289,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -294,7 +298,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -323,7 +327,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -332,14 +336,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -360,17 +364,17 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/system/dept.vue b/src/views/system/dept.vue
index 4a23d3d..e8e2266 100644
--- a/src/views/system/dept.vue
+++ b/src/views/system/dept.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'hasButTwo',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -61,7 +63,7 @@
update,
add,
getDept,
- getDeptTree,
+ getDeptTree
} from "@/api/system/dept";
import { mapGetters } from "vuex";
import website from "@/config/website";
@@ -78,7 +80,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
option: {
lazy: true,
@@ -104,9 +106,9 @@
{
required: true,
message: "请输入机构名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
// {
// label: "所属保安单位",
@@ -143,9 +145,9 @@
{
required: true,
message: "请输入机构全称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "上级机构",
@@ -155,15 +157,15 @@
hide: true,
addDisabled: false,
props: {
- label: "title",
+ label: "title"
},
rules: [
{
required: false,
message: "请选择上级机构",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "机构类型",
@@ -172,7 +174,7 @@
dicUrl: "/api/blade-system/dict/dictionary?code=org_category",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
dataType: "number",
width: 120,
@@ -182,9 +184,9 @@
{
required: true,
message: "请输入机构类型",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "排序",
@@ -196,9 +198,9 @@
{
required: true,
message: "请输入排序",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "备注",
@@ -207,14 +209,14 @@
{
required: false,
message: "请输入备注",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -224,20 +226,23 @@
addBtn: this.vaildData(this.permission.dept_add, false),
viewBtn: this.vaildData(this.permission.dept_view, false),
delBtn: this.vaildData(this.permission.dept_delete, false),
- editBtn: this.vaildData(this.permission.dept_edit, false),
+ editBtn: this.vaildData(this.permission.dept_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
initData() {
- getDeptTree().then((res) => {
+ getDeptTree().then(res => {
const column = this.findObject(this.option.column, "parentId");
column.dicData = res.data.data;
});
@@ -251,7 +256,7 @@
},
rowSave(row, done, loading) {
add(row).then(
- (res) => {
+ res => {
// 获取新增数据的相关字段
const data = res.data.data;
row.id = data.id;
@@ -259,12 +264,12 @@
row.tenantId = data.tenantId;
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
// 数据回调进行刷新
done(row);
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -275,12 +280,12 @@
() => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
// 数据回调进行刷新
done(row);
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -290,7 +295,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -298,7 +303,7 @@
.then(() => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
// 数据回调进行刷新
done(row);
@@ -312,7 +317,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -327,7 +332,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -355,7 +360,7 @@
this.initData();
}
if (["edit", "view"].includes(type)) {
- getDept(this.form.id).then((res) => {
+ getDept(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -380,22 +385,22 @@
onLoad(page, params = {}) {
this.loading = true;
getLazyList(this.parentId, Object.assign(params, this.query)).then(
- (res) => {
+ res => {
this.data = res.data.data;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
}
);
},
treeLoad(tree, treeNode, resolve) {
const parentId = tree.id;
- getLazyList(parentId).then((res) => {
+ getLazyList(parentId).then(res => {
resolve(res.data.data);
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/system/dict.vue b/src/views/system/dict.vue
index 1141204..36118e0 100644
--- a/src/views/system/dict.vue
+++ b/src/views/system/dict.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'hasButTwo',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="optionParent"
:table-loading="loading"
:data="dataParent"
@@ -119,7 +121,7 @@
update,
add,
getDict,
- getDictTree,
+ getDictTree
} from "@/api/system/dict";
import { optionParent, optionChild } from "@/option/system/dict";
import { mapGetters } from "vuex";
@@ -140,13 +142,13 @@
pageSize: 10,
pageSizes: [10, 30, 50, 100, 200],
currentPage: 1,
- total: 0,
+ total: 0
},
pageChild: {
pageSize: 10,
pageSizes: [10, 30, 50, 100, 200],
currentPage: 1,
- total: 0,
+ total: 0
},
dataParent: [],
dataChild: [],
@@ -175,9 +177,9 @@
{
required: true,
message: "请输入字典编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典名称",
@@ -188,9 +190,9 @@
{
required: true,
message: "请输入字典名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典排序",
@@ -202,9 +204,9 @@
{
required: true,
message: "请输入字典排序",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "封存",
@@ -215,12 +217,12 @@
dicData: [
{
label: "否",
- value: 0,
+ value: 0
},
{
label: "是",
- value: 1,
- },
+ value: 1
+ }
],
value: 0,
slot: true,
@@ -228,16 +230,16 @@
{
required: true,
message: "请选择封存",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典备注",
prop: "remark",
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
optionChild: {
height: "auto",
@@ -266,9 +268,9 @@
{
required: true,
message: "请输入字典编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典名称",
@@ -279,9 +281,9 @@
{
required: true,
message: "请输入字典名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "上级字典",
@@ -290,7 +292,7 @@
dicData: [],
hide: true,
props: {
- label: "title",
+ label: "title"
},
addDisabled: true,
editDisabled: true,
@@ -298,9 +300,9 @@
{
required: false,
message: "请选择上级字典",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "字典键值",
@@ -310,9 +312,9 @@
{
required: true,
message: "请输入字典键值",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典排序",
@@ -324,9 +326,9 @@
{
required: true,
message: "请输入字典排序",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "封存",
@@ -337,12 +339,12 @@
dicData: [
{
label: "否",
- value: 0,
+ value: 0
},
{
label: "是",
- value: 1,
- },
+ value: 1
+ }
],
value: 0,
slot: true,
@@ -350,17 +352,17 @@
{
required: true,
message: "请选择封存",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典备注",
prop: "remark",
- hide: true,
- },
- ],
- },
+ hide: true
+ }
+ ]
+ }
};
},
computed: {
@@ -370,23 +372,24 @@
addBtn: this.vaildData(this.permission.dict_add, false),
delBtn: this.vaildData(this.permission.dict_delete, false),
editBtn: this.vaildData(this.permission.dict_edit, false),
- viewBtn: false,
+ viewBtn: false
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
mounted() {
this.initData();
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
initData() {
- getDictTree().then((res) => {
+ getDictTree().then(res => {
const column = this.findObject(this.optionChild.column, "parentId");
column.dicData = res.data.data;
});
@@ -403,18 +406,18 @@
rowSave(row, done, loading) {
const form = {
...row,
- dictKey: -1,
+ dictKey: -1
};
add(form).then(
() => {
this.onLoadParent(this.pageParent);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -426,12 +429,12 @@
this.onLoadParent(this.pageParent);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.onLoadChild(this.pageChild);
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -441,7 +444,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -450,7 +453,7 @@
this.onLoadParent(this.pageParent);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -492,7 +495,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -501,14 +504,14 @@
this.onLoadParent(this.pageParent);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDict(this.formParent.id).then((res) => {
+ getDict(this.formParent.id).then(res => {
this.formParent = res.data.data;
});
}
@@ -529,11 +532,11 @@
this.onLoadChild(this.pageChild);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -545,11 +548,11 @@
this.onLoadChild(this.pageChild);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -559,7 +562,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -568,7 +571,7 @@
this.onLoadChild(this.pageChild);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -597,7 +600,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -606,7 +609,7 @@
this.onLoadChild(this.pageChild);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudChild.toggleSelection();
});
@@ -616,7 +619,7 @@
this.initData();
}
if (["edit", "view"].includes(type)) {
- getDict(this.formChild.id).then((res) => {
+ getDict(this.formChild.id).then(res => {
this.formChild = res.data.data;
});
}
@@ -624,7 +627,7 @@
},
beforeCloseChild(done) {
this.$refs.crudChild.value.parentId = this.parentId;
- this.$refs.crudChild.option.column.filter((item) => {
+ this.$refs.crudChild.option.column.filter(item => {
if (item.prop === "parentId") {
item.value = this.parentId;
}
@@ -646,11 +649,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.pageParent.total = data.total;
this.dataParent = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -661,13 +665,13 @@
page.pageSize,
this.parentId,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
this.dataChild = res.data.data;
this.loadingChild = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
-
diff --git a/src/views/system/dictbiz.vue b/src/views/system/dictbiz.vue
index 123ad28..66987e3 100644
--- a/src/views/system/dictbiz.vue
+++ b/src/views/system/dictbiz.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'hasButTwo',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="optionParent"
:table-loading="loading"
:data="dataParent"
@@ -119,7 +121,7 @@
update,
add,
getDict,
- getDictTree,
+ getDictTree
} from "@/api/system/dictbiz";
import { optionParent, optionChild } from "@/option/system/dictbiz";
import { mapGetters } from "vuex";
@@ -140,13 +142,13 @@
pageSize: 10,
pageSizes: [10, 30, 50, 100, 200],
currentPage: 1,
- total: 0,
+ total: 0
},
pageChild: {
pageSize: 10,
pageSizes: [10, 30, 50, 100, 200],
currentPage: 1,
- total: 0,
+ total: 0
},
dataParent: [],
dataChild: [],
@@ -175,9 +177,9 @@
{
required: true,
message: "请输入字典编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典名称",
@@ -188,9 +190,9 @@
{
required: true,
message: "请输入字典名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典排序",
@@ -203,9 +205,9 @@
{
required: true,
message: "请输入字典排序",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "封存",
@@ -216,12 +218,12 @@
dicData: [
{
label: "否",
- value: 0,
+ value: 0
},
{
label: "是",
- value: 1,
- },
+ value: 1
+ }
],
value: 0,
slot: true,
@@ -229,16 +231,16 @@
{
required: true,
message: "请选择封存",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典备注",
prop: "remark",
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
optionChild: {
height: "auto",
@@ -267,9 +269,9 @@
{
required: true,
message: "请输入字典编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典名称",
@@ -280,9 +282,9 @@
{
required: true,
message: "请输入字典名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "上级字典",
@@ -291,7 +293,7 @@
dicData: [],
hide: true,
props: {
- label: "title",
+ label: "title"
},
addDisabled: true,
editDisabled: true,
@@ -299,9 +301,9 @@
{
required: false,
message: "请选择上级字典",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "字典键值",
@@ -311,9 +313,9 @@
{
required: true,
message: "请输入字典键值",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典排序",
@@ -325,9 +327,9 @@
{
required: true,
message: "请输入字典排序",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "封存",
@@ -338,12 +340,12 @@
dicData: [
{
label: "否",
- value: 0,
+ value: 0
},
{
label: "是",
- value: 1,
- },
+ value: 1
+ }
],
value: 0,
slot: true,
@@ -351,17 +353,17 @@
{
required: true,
message: "请选择封存",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "字典备注",
prop: "remark",
- hide: true,
- },
- ],
- },
+ hide: true
+ }
+ ]
+ }
};
},
computed: {
@@ -371,23 +373,24 @@
addBtn: this.vaildData(this.permission.dictbiz_add, false),
delBtn: this.vaildData(this.permission.dictbiz_delete, false),
editBtn: this.vaildData(this.permission.dictbiz_edit, false),
- viewBtn: false,
+ viewBtn: false
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
mounted() {
this.initData();
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
initData() {
- getDictTree().then((res) => {
+ getDictTree().then(res => {
const column = this.findObject(this.optionChild.column, "parentId");
column.dicData = res.data.data;
});
@@ -404,18 +407,18 @@
rowSave(row, done, loading) {
const form = {
...row,
- dictKey: -1,
+ dictKey: -1
};
add(form).then(
() => {
this.onLoadParent(this.pageParent);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -427,12 +430,12 @@
this.onLoadParent(this.pageParent);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.onLoadChild(this.pageChild);
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -442,7 +445,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -451,7 +454,7 @@
this.onLoadParent(this.pageParent);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -493,7 +496,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -502,14 +505,14 @@
this.onLoadParent(this.pageParent);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDict(this.formParent.id).then((res) => {
+ getDict(this.formParent.id).then(res => {
this.formParent = res.data.data;
});
}
@@ -530,11 +533,11 @@
this.onLoadChild(this.pageChild);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -546,11 +549,11 @@
this.onLoadChild(this.pageChild);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -560,7 +563,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -569,7 +572,7 @@
this.onLoadChild(this.pageChild);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -598,7 +601,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -607,7 +610,7 @@
this.onLoadChild(this.pageChild);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudChild.toggleSelection();
});
@@ -617,7 +620,7 @@
this.initData();
}
if (["edit", "view"].includes(type)) {
- getDict(this.formChild.id).then((res) => {
+ getDict(this.formChild.id).then(res => {
this.formChild = res.data.data;
});
}
@@ -625,7 +628,7 @@
},
beforeCloseChild(done) {
this.$refs.crudChild.value.parentId = this.parentId;
- this.$refs.crudChild.option.column.filter((item) => {
+ this.$refs.crudChild.option.column.filter(item => {
if (item.prop === "parentId") {
item.value = this.parentId;
}
@@ -647,11 +650,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.pageParent.total = data.total;
this.dataParent = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -662,12 +666,13 @@
page.pageSize,
this.parentId,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
this.dataChild = res.data.data;
this.loadingChild = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/system/menu.vue b/src/views/system/menu.vue
index 5d978b6..20d5d72 100644
--- a/src/views/system/menu.vue
+++ b/src/views/system/menu.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'hasButTwo',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -77,7 +79,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
option: {
lazy: true,
@@ -103,9 +105,9 @@
{
required: true,
message: "请输入菜单名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "路由地址",
@@ -114,9 +116,9 @@
{
required: true,
message: "请输入路由地址",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "上级菜单",
@@ -126,15 +128,15 @@
hide: true,
addDisabled: false,
props: {
- label: "title",
+ label: "title"
},
rules: [
{
required: false,
message: "请选择上级菜单",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "菜单图标",
@@ -146,9 +148,9 @@
{
required: true,
message: "请输入菜单图标",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "菜单编号",
@@ -158,9 +160,9 @@
{
required: true,
message: "请输入菜单编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单类型",
@@ -169,21 +171,21 @@
dicData: [
{
label: "菜单",
- value: 1,
+ value: 1
},
{
label: "按钮",
- value: 2,
- },
+ value: 2
+ }
],
hide: true,
rules: [
{
required: true,
message: "请选择菜单类型",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单别名",
@@ -193,9 +195,9 @@
{
required: true,
message: "请输入菜单别名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "新窗口",
@@ -205,21 +207,21 @@
dicData: [
{
label: "否",
- value: 1,
+ value: 1
},
{
label: "是",
- value: 2,
- },
+ value: 2
+ }
],
value: 1,
rules: [
{
required: true,
message: "请选择新窗口打开",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单排序",
@@ -231,9 +233,9 @@
{
required: true,
message: "请输入菜单排序",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单备注",
@@ -241,17 +243,17 @@
type: "textarea",
span: 24,
minRows: 2,
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
- data: [],
+ data: []
};
},
watch: {
"form.category"() {
const category = func.toInt(this.form.category);
- this.$refs.crud.option.column.filter((item) => {
+ this.$refs.crud.option.column.filter(item => {
if (item.prop === "path") {
item.rules[0].required = category === 1;
}
@@ -259,7 +261,7 @@
item.disabled = category === 2;
}
});
- },
+ }
},
computed: {
...mapGetters(["userInfo", "permission"]),
@@ -268,20 +270,23 @@
addBtn: this.vaildData(this.permission.menu_add, false),
viewBtn: this.vaildData(this.permission.menu_view, false),
delBtn: this.vaildData(this.permission.menu_delete, false),
- editBtn: this.vaildData(this.permission.menu_edit, false),
+ editBtn: this.vaildData(this.permission.menu_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
initData() {
- getMenuTree().then((res) => {
+ getMenuTree().then(res => {
const column = this.findObject(this.option.column, "parentId");
column.dicData = res.data.data;
});
@@ -295,18 +300,18 @@
},
rowSave(row, done, loading) {
add(row).then(
- (res) => {
+ res => {
// 获取新增数据的相关字段
const data = res.data.data;
row.id = data.id;
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
// 数据回调进行刷新
done(row);
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -317,12 +322,12 @@
() => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
// 数据回调进行刷新
done(row);
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -332,7 +337,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -340,7 +345,7 @@
.then(() => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
// 数据回调进行刷新
done(row);
@@ -354,7 +359,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -369,7 +374,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -397,7 +402,7 @@
this.initData();
}
if (["edit", "view"].includes(type)) {
- getMenu(this.form.id).then((res) => {
+ getMenu(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -422,22 +427,22 @@
onLoad(page, params = {}) {
this.loading = true;
getLazyList(this.parentId, Object.assign(params, this.query)).then(
- (res) => {
+ res => {
this.data = res.data.data;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
}
);
},
treeLoad(tree, treeNode, resolve) {
const parentId = tree.id;
- getLazyList(parentId).then((res) => {
+ getLazyList(parentId).then(res => {
resolve(res.data.data);
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/system/param.vue b/src/views/system/param.vue
index 86c5d7c..702ba49 100644
--- a/src/views/system/param.vue
+++ b/src/views/system/param.vue
@@ -1,14 +1,19 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
v-bind="bindVal"
v-on="onEvent"
v-model="form"
:permission="permissionList"
:page.sync="page"
:option="option"
+ @on-load="onLoad"
>
<template slot="menuLeft">
<el-button
@@ -31,8 +36,8 @@
data() {
return {
option: {
- ...this.$store.state.control.clearOtherBut,
- },
+ ...this.$store.state.control.clearOtherBut
+ }
};
},
computed: {
@@ -41,18 +46,22 @@
addBtn: this.vaildData(this.permission.param_add, false),
viewBtn: this.vaildData(this.permission.param_view, false),
delBtn: this.vaildData(this.permission.param_delete, false),
- editBtn: this.vaildData(this.permission.param_edit, false),
+ editBtn: this.vaildData(this.permission.param_edit, false)
};
- },
+ }
},
- methods: {},
+ mounted() {
+ setTimeout(() => {
+ this.$store.commit("setWindowSizeHeightAdd");
+ }, 2000);
+ },
+ methods: {}
},
{
//模块路径
- name: "system/param",
+ name: "system/param"
}
);
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/system/post.vue b/src/views/system/post.vue
index a682b9d..79fd426 100644
--- a/src/views/system/post.vue
+++ b/src/views/system/post.vue
@@ -1,8 +1,12 @@
<template>
- <basic-container :class="[
-$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
-]">
+ <basic-container
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -55,7 +59,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -82,16 +86,16 @@
span: 24,
props: {
label: "tenantName",
- value: "tenantId",
+ value: "tenantId"
},
hide: !website.tenantMode,
rules: [
{
required: true,
message: "请输入所属保安单位",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "岗位类型",
@@ -100,7 +104,7 @@
dicUrl: "/api/blade-system/dict/dictionary?code=post_category",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
dataType: "number",
slot: true,
@@ -109,9 +113,9 @@
{
required: true,
message: "请选择岗位类型",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "岗位编号",
@@ -121,9 +125,9 @@
{
required: true,
message: "请输入岗位编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "岗位名称",
@@ -133,9 +137,9 @@
{
required: true,
message: "请输入岗位名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "岗位排序",
@@ -145,9 +149,9 @@
{
required: true,
message: "请输入岗位排序",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "岗位描述",
@@ -155,11 +159,11 @@
type: "textarea",
span: 24,
minRows: 6,
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -169,16 +173,19 @@
addBtn: this.vaildData(this.permission.post_add, false),
viewBtn: this.vaildData(this.permission.post_view, false),
delBtn: this.vaildData(this.permission.post_delete, false),
- editBtn: this.vaildData(this.permission.post_edit, false),
+ editBtn: this.vaildData(this.permission.post_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
rowSave(row, done, loading) {
@@ -187,11 +194,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -203,11 +210,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -217,7 +224,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -226,7 +233,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -238,7 +245,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -247,14 +254,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -292,17 +299,17 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/system/tenant.vue b/src/views/system/tenant.vue
index 95bd359..13d3c6f 100644
--- a/src/views/system/tenant.vue
+++ b/src/views/system/tenant.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -93,7 +97,7 @@
update,
add,
setting,
- datasource,
+ datasource
} from "@/api/system/tenant";
import { mapGetters } from "vuex";
@@ -110,7 +114,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
option: {
height: "auto",
@@ -141,9 +145,9 @@
{
required: true,
message: "请输入保安单位ID",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "保安企业名称",
@@ -157,9 +161,9 @@
{
required: true,
message: "请输入参数名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "联系人",
@@ -172,14 +176,14 @@
{
required: true,
message: "请输入联系人",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "联系电话",
prop: "contactNumber",
- width: 150,
+ width: 150
},
{
label: "联系地址",
@@ -187,7 +191,7 @@
span: 24,
minRows: 2,
type: "textarea",
- hide: true,
+ hide: true
},
{
label: "账号额度",
@@ -195,7 +199,7 @@
width: 90,
slot: true,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
},
{
label: "过期时间",
@@ -203,12 +207,12 @@
width: 180,
slot: true,
addDisplay: false,
- editDisplay: false,
+ editDisplay: false
},
{
label: "绑定域名",
prop: "domain",
- span: 24,
+ span: 24
},
{
label: "系统背景",
@@ -218,12 +222,12 @@
action: "/api/blade-resource/oss/endpoint/put-file",
propsHttp: {
res: "data",
- url: "link",
+ url: "link"
},
hide: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
data: [],
settingForm: {},
@@ -233,7 +237,7 @@
label: "账号额度",
prop: "accountNumber",
type: "number",
- span: 24,
+ span: 24
},
{
label: "过期时间",
@@ -241,9 +245,9 @@
type: "date",
format: "yyyy-MM-dd hh:mm:ss",
valueFormat: "yyyy-MM-dd hh:mm:ss",
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
datasourceForm: {},
datasourceOption: {
@@ -257,18 +261,18 @@
dicUrl: "/api/blade-develop/datasource/select",
props: {
label: "name",
- value: "id",
+ value: "id"
},
rules: [
{
required: true,
message: "请选择数据源",
- trigger: "blur",
- },
- ],
- },
- ],
- },
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
+ }
};
},
computed: {
@@ -278,19 +282,22 @@
addBtn: this.vaildData(this.permission.tenant_add, false),
viewBtn: this.vaildData(this.permission.tenant_view, false),
delBtn: this.vaildData(this.permission.tenant_delete, false),
- editBtn: this.vaildData(this.permission.tenant_edit, false),
+ editBtn: this.vaildData(this.permission.tenant_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
tenantId() {
return this.selectionList[0].tenantId;
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
rowSave(row, done, loading) {
@@ -299,11 +306,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -315,11 +322,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -329,7 +336,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -338,13 +345,13 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
beforeOpen(done, type) {
if (["view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
const data = res.data.data;
if (!(data.accountNumber > 0)) {
data.accountNumber = "不限制";
@@ -382,7 +389,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -391,7 +398,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
@@ -402,7 +409,7 @@
return;
}
if (this.selectionList.length === 1) {
- getDetail(this.selectionList[0].id).then((res) => {
+ getDetail(this.selectionList[0].id).then(res => {
const data = res.data.data;
this.settingForm.accountNumber = data.accountNumber;
this.settingForm.expireTime = data.expireTime;
@@ -422,7 +429,7 @@
this.$message.warning("只能选择一条数据");
return;
}
- getDetail(this.selectionList[0].id).then((res) => {
+ getDetail(this.selectionList[0].id).then(res => {
const data = res.data.data;
this.datasourceForm.datasourceId = data.datasourceId;
});
@@ -434,12 +441,12 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "配置成功!",
+ message: "配置成功!"
});
done();
this.box = false;
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -450,12 +457,12 @@
() => {
this.$message({
type: "success",
- message: "配置成功!",
+ message: "配置成功!"
});
done();
this.datasourceBox = false;
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -476,17 +483,17 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/system/topmenu.vue b/src/views/system/topmenu.vue
index 45d00c4..fa4dc32 100644
--- a/src/views/system/topmenu.vue
+++ b/src/views/system/topmenu.vue
@@ -2,10 +2,12 @@
<basic-container
:class="[
'topmenu',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -91,7 +93,7 @@
remove,
grant,
grantTree,
- getTopTree,
+ getTopTree
} from "@/api/system/topmenu";
import { mapGetters } from "vuex";
import iconList from "@/config/iconList";
@@ -105,13 +107,13 @@
loading: true,
props: {
label: "title",
- value: "key",
+ value: "key"
},
page: {
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
menuGrantList: [],
@@ -138,9 +140,9 @@
{
required: true,
message: "请输入菜单名",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单图标",
@@ -152,9 +154,9 @@
{
required: true,
message: "请输入菜单图标",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "菜单编号",
@@ -164,9 +166,9 @@
{
required: true,
message: "请输入菜单编号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "菜单排序",
@@ -177,13 +179,13 @@
{
required: true,
message: "请输入菜单排序",
- trigger: "blur",
- },
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -193,23 +195,26 @@
addBtn: this.vaildData(this.permission.topmenu_add, false),
viewBtn: this.vaildData(this.permission.topmenu_view, false),
delBtn: this.vaildData(this.permission.topmenu_delete, false),
- editBtn: this.vaildData(this.permission.topmenu_edit, false),
+ editBtn: this.vaildData(this.permission.topmenu_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
idsArray() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids;
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
submit() {
@@ -218,7 +223,7 @@
this.box = false;
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.onLoad(this.page);
});
@@ -229,11 +234,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -245,11 +250,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -259,7 +264,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -268,7 +273,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -280,7 +285,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -289,7 +294,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
@@ -300,9 +305,9 @@
return;
}
this.menuTreeObj = [];
- grantTree().then((res) => {
+ grantTree().then(res => {
this.menuGrantList = res.data.data.menu;
- getTopTree(this.ids).then((res) => {
+ getTopTree(this.ids).then(res => {
this.menuTreeObj = res.data.data.menu;
this.box = true;
});
@@ -310,7 +315,7 @@
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -321,7 +326,7 @@
() => {
this.onLoad(this.page);
},
- (error) => {
+ error => {
window.console.log(error);
}
);
@@ -358,15 +363,16 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/system/user.vue b/src/views/system/user.vue
index 3ed7870..e527212 100644
--- a/src/views/system/user.vue
+++ b/src/views/system/user.vue
@@ -16,10 +16,12 @@
<el-col :span="sizes[1]">
<basic-container
:class="[
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
]"
>
<avue-crud
+ class="tablesss"
:option="option"
:search.sync="search"
:table-loading="loading"
@@ -198,7 +200,7 @@
add,
grant,
resetPassword,
- getJurisdiction,
+ getJurisdiction
} from "@/api/system/user";
import { getSecurityDeptTree, getDeptLazyTree } from "@/api/system/dept";
import { getRoleTree } from "@/api/system/role";
@@ -246,21 +248,21 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
platformPage: {
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
init: {
roleTree: [],
- deptTree: [],
+ deptTree: []
},
props: {
label: "title",
- value: "key",
+ value: "key"
},
roleGrantList: [],
roleTreeObj: [],
@@ -294,8 +296,8 @@
labelText: "标题",
label: "title",
value: "value",
- children: "children",
- },
+ children: "children"
+ }
},
// treeOption:{
// nodeKey: "id",
@@ -337,29 +339,29 @@
prop: "account",
search: true,
width: 190,
- display: false,
+ display: false
},
{
label: "所属组织机构",
prop: "deptName",
slot: true,
overHidden: true,
- display: false,
+ display: false
},
{
label: "用户姓名",
prop: "realName",
search: true,
width: 90,
- display: false,
+ display: false
},
{
label: "所属角色",
prop: "roleName",
slot: true,
width: 130,
- display: false,
- },
+ display: false
+ }
],
group: [
{
@@ -376,7 +378,7 @@
// dicUrl: "/api/blade-system/dept/lazy-tree",
props: {
label: "title",
- value: "id",
+ value: "id"
},
dicData: [],
// hide: !website.tenantMode,
@@ -387,10 +389,10 @@
{
required: true,
message: "所属组织机构",
- trigger: "click",
- },
+ trigger: "click"
+ }
],
- span: 12,
+ span: 12
},
{
label: "登录账号",
@@ -399,9 +401,9 @@
{
required: true,
message: "请输入登录账号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "密码",
@@ -412,8 +414,8 @@
viewDisplay: false,
span: 12,
rules: [
- { required: true, validator: validatePass, trigger: "blur" },
- ],
+ { required: true, validator: validatePass, trigger: "blur" }
+ ]
},
{
label: "确认密码",
@@ -424,10 +426,10 @@
editDisplay: false,
viewDisplay: false,
rules: [
- { required: true, validator: validatePass2, trigger: "blur" },
- ],
- },
- ],
+ { required: true, validator: validatePass2, trigger: "blur" }
+ ]
+ }
+ ]
},
{
label: "详细信息",
@@ -442,14 +444,14 @@
{
required: true,
message: "请输入用户姓名",
- trigger: "blur",
+ trigger: "blur"
},
{
min: 2,
max: 5,
- message: "姓名长度在2到5个字符",
- },
- ],
+ message: "姓名长度在2到5个字符"
+ }
+ ]
},
{
label: "所属角色",
@@ -458,7 +460,7 @@
type: "tree",
dicData: [],
props: {
- label: "title",
+ label: "title"
},
checkStrictly: true,
slot: true,
@@ -466,9 +468,9 @@
{
required: true,
message: "请选择所属角色",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "警号",
@@ -478,9 +480,9 @@
{
required: true,
message: "请输入警号",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "身份证号码",
@@ -490,14 +492,14 @@
{
required: true,
message: "请输入身份证号码",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "手机号码",
prop: "phone",
- overHidden: true,
+ overHidden: true
},
{
label: "用户性别",
@@ -506,25 +508,25 @@
dicData: [
{
label: "男",
- value: 1,
+ value: 1
},
{
label: "女",
- value: 2,
- },
+ value: 2
+ }
],
hide: true,
rules: [
{
required: true,
message: "请选择性别",
- trigger: "blur",
- },
- ],
- },
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
+ }
+ ]
},
data: [],
platformQuery: {},
@@ -547,25 +549,25 @@
label: "登录账号",
prop: "account",
search: true,
- display: false,
+ display: false
},
{
label: "所属单位",
prop: "tenantName",
slot: true,
- display: false,
+ display: false
},
{
label: "用户姓名",
prop: "realName",
search: true,
- display: false,
+ display: false
},
{
label: "用户平台",
prop: "userTypeName",
slot: true,
- display: false,
+ display: false
},
{
label: "用户平台",
@@ -573,7 +575,7 @@
dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
props: {
label: "dictValue",
- value: "dictKey",
+ value: "dictKey"
},
dataType: "number",
search: true,
@@ -584,9 +586,9 @@
{
required: true,
message: "请选择用户平台",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "用户拓展",
@@ -596,9 +598,9 @@
span: 24,
overHidden: true,
row: true,
- hide: true,
- },
- ],
+ hide: true
+ }
+ ]
},
excelForm: {},
excelOption: {
@@ -613,10 +615,10 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/blade-user/import-user",
+ action: "/api/blade-user/import-user"
},
{
label: "数据覆盖",
@@ -627,12 +629,12 @@
dicData: [
{
label: "否",
- value: 0,
+ value: 0
},
{
label: "是",
- value: 1,
- },
+ value: 1
+ }
],
value: 0,
slot: true,
@@ -640,18 +642,18 @@
{
required: true,
message: "请选择是否覆盖",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
- },
+ span: 24
+ }
+ ]
+ }
};
},
watch: {
@@ -668,7 +670,7 @@
const column = this.findObject(this.excelOption.column, "excelFile");
column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
}
- },
+ }
},
computed: {
...mapGetters(["userInfo", "permission"]),
@@ -677,7 +679,7 @@
addBtn: this.vaildData(this.permission.user_add, false),
viewBtn: this.vaildData(this.permission.user_view, false),
delBtn: this.vaildData(this.permission.user_delete, false),
- editBtn: this.vaildData(this.permission.user_edit, false),
+ editBtn: this.vaildData(this.permission.user_edit, false)
};
},
platformPermissionList() {
@@ -685,16 +687,16 @@
addBtn: false,
viewBtn: false,
delBtn: false,
- editBtn: this.vaildData(this.permission.user_edit, false),
+ editBtn: this.vaildData(this.permission.user_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
created() {
// console.log(this.userInfo.role_name);
@@ -718,10 +720,10 @@
if (this.userInfo.role_name == "公安管理员") {
var parentId = this.userInfo.dept_id;
var userId = this.userInfo.Id;
- getDeptLazyTree(parentId, userId).then((res) => {
+ getDeptLazyTree(parentId, userId).then(res => {
that.treeData = res.data.data;
that.treeOption.defaultExpandedKeys = [];
- res.data.data.forEach((item) => {
+ res.data.data.forEach(item => {
that.treeOption.defaultExpandedKeys.push(item.id);
});
});
@@ -739,7 +741,7 @@
// );
// });
// };
- getDeptLazyTree(0).then((res) => {
+ getDeptLazyTree(0).then(res => {
that.treeData = res.data.data;
});
// var parentId1 = this.userInfo.dept_id;
@@ -753,6 +755,7 @@
if (!website.tenantMode) {
this.initData(website.tenantId, this.userInfo.role_name);
}
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
nodeClick(data) {
@@ -765,14 +768,18 @@
this.onLoad(this.page);
},
initData(tenantId, d) {
- getRoleTree(tenantId).then((res) => {
+ getRoleTree(tenantId).then(res => {
const column = this.findObject(this.option.group, "roleId");
var k = res.data.data;
var b = [];
if (d == "保安公司管理员") {
// console.log(k);
for (var n in k) {
- if (k[n].title == "保安" || k[n].title == "保安公司管理员" || k[n].title == "分公司管理员") {
+ if (
+ k[n].title == "保安" ||
+ k[n].title == "保安公司管理员" ||
+ k[n].title == "分公司管理员"
+ ) {
b.push(k[n]);
}
}
@@ -782,16 +789,19 @@
if (k[j].title == "分公司管理员" || k[j].title == "保安") {
b.push(k[j]);
}
- if(k[j].children){
+ if (k[j].children) {
for (var h in k[j].children) {
- if (k[j].children[h].title == "分公司管理员" || k[j].children[h].title == "保安") {
+ if (
+ k[j].children[h].title == "分公司管理员" ||
+ k[j].children[h].title == "保安"
+ ) {
b.push(k[j].children[h]);
}
}
}
}
column.dicData = b;
- }else if (d == "公安管理员") {
+ } else if (d == "公安管理员") {
for (var i in k) {
if (k[i].title == "公安管理员") {
b.push(k[i]);
@@ -802,26 +812,24 @@
column.dicData = k;
}
});
-// this.userInfo.role_name == "保安公司管理员"
+ // this.userInfo.role_name == "保安公司管理员"
//公安局进入
- if (
- this.userInfo.role_name == "公安管理员"
- ) {
+ if (this.userInfo.role_name == "公安管理员") {
var parentId = this.userInfo.dept_id;
var userId = this.userInfo.Id;
- getDeptLazyTree(parentId, userId).then((res) => {
+ getDeptLazyTree(parentId, userId).then(res => {
const column = this.findObject(this.option.group, "deptId");
column.dicData = res.data.data;
});
- } else if( this.userInfo.role_name == "administrator"){
- getDeptLazyTree(0).then((res) => {
+ } else if (this.userInfo.role_name == "administrator") {
+ getDeptLazyTree(0).then(res => {
const column = this.findObject(this.option.group, "deptId");
column.dicData = res.data.data;
});
- }else {
- getSecurityDeptTree(null,null,this.userInfo.dept_id).then((res) => {
- const column = this.findObject(this.option.group, "deptId");
- column.dicData = res.data.data;
+ } else {
+ getSecurityDeptTree(null, null, this.userInfo.dept_id).then(res => {
+ const column = this.findObject(this.option.group, "deptId");
+ column.dicData = res.data.data;
});
}
// getDeptTree(tenantId).then((res) => {
@@ -839,7 +847,7 @@
this.roleBox = false;
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.onLoad(this.page);
});
@@ -848,9 +856,9 @@
row.deptId = row.deptId;
row.roleId = row.roleId.join(",");
var params = {
- deptname: row.$deptId,
+ deptname: row.$deptId
};
- getJurisdiction(params).then((res) => {
+ getJurisdiction(params).then(res => {
if (res.data.msg != "暂无承载数据") {
row.jurisdiction = res.data.data;
} else {
@@ -862,11 +870,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -885,11 +893,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -899,7 +907,7 @@
this.$confirm("确定将选择用户注销?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -908,7 +916,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -938,7 +946,7 @@
this.$confirm("确定将选择用户注销?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -947,7 +955,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
@@ -960,7 +968,7 @@
this.$confirm("确定将选择账号密码重置为123456?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return resetPassword(this.ids);
@@ -968,7 +976,7 @@
.then(() => {
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
@@ -982,7 +990,7 @@
if (this.selectionList.length === 1) {
this.roleTreeObj = this.selectionList[0].roleId.split(",");
}
- getRoleTree().then((res) => {
+ getRoleTree().then(res => {
this.roleGrantList = res.data.data;
this.roleBox = true;
});
@@ -1003,7 +1011,7 @@
this.$confirm("是否导出用户数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
window.open(
`/api/blade-user/export-user?${
@@ -1028,7 +1036,7 @@
column.display = false;
}
- getUser(this.form.id).then((res) => {
+ getUser(this.form.id).then(res => {
this.form = res.data.data;
if (this.form.hasOwnProperty("deptId")) {
this.form.deptId = this.form.deptId;
@@ -1079,11 +1087,12 @@
Object.assign(params, this.query),
deptid,
jurisdiction
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
},
@@ -1093,11 +1102,11 @@
this.platformOnLoad(this.platformPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -1105,7 +1114,7 @@
},
platformBeforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getUserPlatform(this.platformForm.id).then((res) => {
+ getUserPlatform(this.platformForm.id).then(res => {
this.platformForm = res.data.data;
});
}
@@ -1147,21 +1156,22 @@
Object.assign(params, this.query),
deptid,
jurisdiction
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.platformPage.total = data.total;
this.platformData = data.records;
this.platformLoading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
<style>
.box {
- height: 800px;
+ height: auto;
}
.el-scrollbar {
diff --git a/src/views/talk/talk.vue b/src/views/talk/talk.vue
index 2a94313..800fa47 100644
--- a/src/views/talk/talk.vue
+++ b/src/views/talk/talk.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -69,7 +73,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -83,6 +87,7 @@
index: true,
viewBtn: true,
selection: true,
+ menu: false,
dialogClickModal: false,
...this.$store.state.control.clearOtherBut,
column: [
@@ -95,9 +100,9 @@
{
required: true,
message: "请输入标题",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "谈话对象",
@@ -114,9 +119,9 @@
{
required: true,
message: "请输入谈话对象",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "谈话内容",
@@ -125,9 +130,9 @@
{
required: true,
message: "请输入谈话内容",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "谈话时间",
@@ -139,9 +144,9 @@
{
required: true,
message: "请输入谈话时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "结论",
@@ -150,9 +155,9 @@
{
required: true,
message: "请输入结论",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "评价",
@@ -161,9 +166,9 @@
{
required: true,
message: "请输入评价",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "图片",
@@ -171,16 +176,16 @@
// dataType: 'string',
type: "upload",
propsHttp: {
- res: "data",
+ res: "data"
},
span: 24,
listType: "picture-card",
tip: "只能上传jpg/png文件，且不超过500kb",
- action: "/api/blade-resource/oss/endpoint/put-files-talk?file=",
- },
- ],
+ action: "/api/blade-resource/oss/endpoint/put-files-talk?file="
+ }
+ ]
},
- data: [],
+ data: []
};
},
computed: {
@@ -190,16 +195,19 @@
addBtn: this.vaildData(this.permission.talk_add, false),
viewBtn: this.vaildData(this.permission.talk_view, false),
delBtn: this.vaildData(this.permission.talk_delete, false),
- editBtn: this.vaildData(this.permission.talk_edit, false),
+ editBtn: this.vaildData(this.permission.talk_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
searchChange(params, done) {
@@ -220,11 +228,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
window.console.log(error);
}
@@ -236,11 +244,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
console.log(error);
}
@@ -250,7 +258,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -259,7 +267,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -271,7 +279,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -280,14 +288,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -320,16 +328,17 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
console.log(this.data);
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/trainExam/index.vue b/src/views/trainExam/index.vue
index 48b95c8..664dd69 100644
--- a/src/views/trainExam/index.vue
+++ b/src/views/trainExam/index.vue
@@ -1,129 +1,119 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-05 16:31:54
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-23 14:12:55
- * menu-name 考试管理
- */
+/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
+@Last Modified time: 2021-11-23 14:12:55 * menu-name 考试管理 */
<template>
- <el-row class="morpheus-box-paper">
- <el-col :span="24">
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
- >
- <avue-crud
- v-model="form"
- class="company-box"
- :option="questionBankOption"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- ref="questionBankCrud"
- :page.sync="questionBankPage"
- @on-load="questionBankOnLoad"
- :before-open="beforeOpen"
- @selection-change="questionBankSelectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-save="questionBankRowSave"
- @row-update="questionBankRowUpdate"
- @row-del="questionBankRowDel"
- >
- <template slot-scope="{ row }" slot="auditStatus">
- <el-tag class="dtype">
- {{
- row.auditStatus == 1
- ? "审核通过"
- : row.auditStatus == 2
- ? "审核不通过"
- : "待审核"
- }}
- <i class="zc" v-if="row.auditStatus == 1"></i>
- <i class="yj" v-if="row.auditStatus == 2"></i>
- <i class="gz" v-if="row.auditStatus == 3"></i>
- </el-tag>
- </template>
- <template slot="menuLeft">
- <el-button
- style="display: none"
- type="danger"
- size="small"
- icon="el-icon-delete"
- @click="questionBankHandleDelete"
- >删 除
- </el-button>
- <!--图例 components-->
- <span>
- <Legend :datas="datalistLIU"></Legend>
- </span>
- </template>
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ v-model="form"
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ ref="questionBankCrud"
+ :page.sync="questionBankPage"
+ @on-load="questionBankOnLoad"
+ :before-open="beforeOpen"
+ @selection-change="questionBankSelectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-save="questionBankRowSave"
+ @row-update="questionBankRowUpdate"
+ @row-del="questionBankRowDel"
+ >
+ <template slot-scope="{ row }" slot="auditStatus">
+ <el-tag class="dtype">
+ {{
+ row.auditStatus == 1
+ ? "审核通过"
+ : row.auditStatus == 2
+ ? "审核不通过"
+ : "待审核"
+ }}
+ <i class="zc" v-if="row.auditStatus == 1"></i>
+ <i class="yj" v-if="row.auditStatus == 2"></i>
+ <i class="gz" v-if="row.auditStatus == 3"></i>
+ </el-tag>
+ </template>
+ <template slot="menuLeft">
+ <el-button
+ style="display: none"
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ @click="questionBankHandleDelete"
+ >删 除
+ </el-button>
+ <!--图例 components-->
+ <span>
+ <Legend :datas="datalistLIU"></Legend>
+ </span>
+ </template>
- <template slot-scope="{ row }" slot="examStatus">
- <el-tag>{{ row.examStatus == 0 ? "已发布" : "草稿" }}</el-tag>
- </template>
+ <template slot-scope="{ row }" slot="examStatus">
+ <el-tag>{{ row.examStatus == 0 ? "已发布" : "草稿" }}</el-tag>
+ </template>
- <template slot-scope="{ row }" slot="menu">
- <el-button
- type="text"
- size="mini"
- icon="el-icon-collection"
- class="start-kaoshi"
- v-if="permission.trainExam_trainPapers"
- @click="startExam(row)"
- >报名清册
- </el-button>
- <el-button
- type="text"
- size="mini"
- icon="el-icon-folder-checked"
- v-if="permission.trainExam_check"
- @click="handleAudit(row)"
- >审核
- </el-button>
- <el-button
- type="text"
- size="mini"
- icon="el-icon-circle-check"
- v-if="permission.trainExam_confirm"
- @click="handleConfirm(row)"
- >考试名单确认
- </el-button>
- <el-button
- type="text"
- size="mini"
- icon="el-icon-search"
- v-if="permission.trainExam_index_examScoreViews"
- @click="examScoreViews(row)"
- >成绩查看
- </el-button>
- </template>
- </avue-crud>
+ <template slot-scope="{ row }" slot="menu">
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-collection"
+ class="start-kaoshi"
+ v-if="permission.trainExam_trainPapers"
+ @click="startExam(row)"
+ >报名清册
+ </el-button>
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-folder-checked"
+ v-if="permission.trainExam_check"
+ @click="handleAudit(row)"
+ >审核
+ </el-button>
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-circle-check"
+ v-if="permission.trainExam_confirm"
+ @click="handleConfirm(row)"
+ >考试名单确认
+ </el-button>
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-search"
+ v-if="permission.trainExam_index_examScoreViews"
+ @click="examScoreViews(row)"
+ >成绩查看
+ </el-button>
+ </template>
+ </avue-crud>
- <el-dialog
- title="考试申请审核"
- :visible.sync="dialogFormVisible"
- modal-append-to-body="false"
- append-to-body="true"
- :close-on-click-model="true"
- >
- <avue-form
- ref="formAudit"
- v-model="Audit"
- :option="optionAudit"
- @reset-change="emptytChange"
- @submit="submit"
- ></avue-form>
- </el-dialog>
- </div>
- </el-card>
- </el-col>
- </el-row>
+ <el-dialog
+ title="考试申请审核"
+ :visible.sync="dialogFormVisible"
+ modal-append-to-body="false"
+ append-to-body="true"
+ :close-on-click-model="true"
+ >
+ <avue-form
+ ref="formAudit"
+ v-model="Audit"
+ :option="optionAudit"
+ @reset-change="emptytChange"
+ @submit="submit"
+ ></avue-form>
+ </el-dialog>
+ </basic-container>
</template>
<script>
@@ -133,14 +123,14 @@
remove,
update,
updateAudit,
- applyConfirm,
+ applyConfirm
} from "@/api/examapi/examination";
import { auditColumn } from "./data";
import { mapGetters } from "vuex";
import Legend from "@/components/liu-legend/Legend";
export default {
components: {
- Legend,
+ Legend
},
data() {
var validatePass = (rule, value, callback) => {
@@ -163,16 +153,16 @@
datalistLIU: [
{
color: "#29C093",
- text: "审核通过",
+ text: "审核通过"
},
{
color: "#F34A4A",
- text: "审核不通过",
+ text: "审核不通过"
},
{
color: "#F48F57",
- text: "待审核",
- },
+ text: "待审核"
+ }
],
Audit: {},
dialogFormVisible: false,
@@ -194,7 +184,7 @@
menuWidth: 230,
dialogClickModal: false,
column: auditColumn,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
questionBankOption: {
// 操作栏多余按钮去除
@@ -226,9 +216,9 @@
label: "培训学校名称",
prop: "deptName",
slot: true,
- search:true,
- searchSpan:5,
- searchLabelWidth:110,
+ search: true,
+ searchSpan: 5,
+ searchLabelWidth: 110,
// 表单新增时是否禁止
addDisabled: true,
// 表单新增时是否可见
@@ -243,7 +233,7 @@
editDetail: false,
// hide: true,
display: false,
- overHidden: true,
+ overHidden: true
},
// {
// label: "考试名称",
@@ -279,8 +269,8 @@
type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
- search:true,
- searchSpan:4,
+ search: true,
+ searchSpan: 4,
hide: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -298,9 +288,9 @@
{
required: true,
message: "请选择考试时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "考试时间",
@@ -325,9 +315,9 @@
{
required: true,
message: "请选择考试时间",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "考试开始时间",
@@ -347,7 +337,7 @@
editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 120,
+ width: 120
},
{
label: "考试开始截止时间",
@@ -368,7 +358,7 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 120,
+ width: 120
},
// {
@@ -428,7 +418,7 @@
// 表单编辑时是否可见
editDisplay: false,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "注意事项",
@@ -449,7 +439,7 @@
editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 150,
+ width: 150
},
{
label: "报名人数",
@@ -469,7 +459,7 @@
editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 70,
+ width: 70
},
{
label: "考试人数",
@@ -489,7 +479,7 @@
editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 70,
+ width: 70
},
{
label: "申请时间",
@@ -504,9 +494,9 @@
{
required: true,
message: "请选择结束时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "审核时间",
@@ -521,9 +511,9 @@
{
required: true,
message: "请选择结束时间",
- trigger: "click",
- },
- ],
+ trigger: "click"
+ }
+ ]
},
{
label: "审核状态",
@@ -538,24 +528,24 @@
{
required: true,
message: "请选择审核类型",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
dicData: [
{
label: "审核通过",
- value: 1,
+ value: 1
},
{
label: "不通过",
- value: 2,
+ value: 2
},
{
label: "待审核",
- value: 3,
- },
+ value: 3
+ }
],
- width: 110,
+ width: 110
},
{
label: "审核明细",
@@ -563,7 +553,7 @@
addDisplay: false,
prop: "auditDetail",
width: 90,
- overHidden: true,
+ overHidden: true
},
{
label: "距考试开始时间",
@@ -571,7 +561,7 @@
addDisplay: false,
prop: "deadline",
width: 110,
- overHidden: true,
+ overHidden: true
},
{
label: "考试名单确认人",
@@ -591,7 +581,7 @@
editDetail: false,
// hide: true,
display: false,
- width: 110,
+ width: 110
},
{
label: "确认时间",
@@ -612,9 +602,9 @@
editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 130,
- },
- ],
+ width: 130
+ }
+ ]
},
questionBankSearch: {},
questionBankLoading: true,
@@ -623,17 +613,19 @@
pageSize: 10,
currentPage: 1,
total: 16,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
questionBankQuery: {},
- questionBankSelectionList: [],
+ questionBankSelectionList: []
};
},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
computed: {
ids() {
let ids = [];
- this.questionBankSelectionList.forEach((ele) => {
+ this.questionBankSelectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
@@ -644,9 +636,9 @@
addBtn: this.vaildData(null, false),
viewBtn: this.vaildData(this.permission.trainExam_edit, false),
delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false)
};
- },
+ }
},
watch: {},
methods: {
@@ -661,11 +653,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.questionBankQuery)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.questionBankPage.total = data.total;
this.questionBankData = data.records;
this.questionBankLoading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.questionBankSelectionClear();
});
},
@@ -707,27 +700,27 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
- done();
+ done();
}
);
},
- beforeOpen(done, type) {
- if(this.userInfo.role_name=="培训公司管理员"){
- if (["edit"].includes(type)) {
- if(this.form.auditStatus==1){
- this.$message({
- type: "warning",
- message: "当前考试申请已审核通过,无法再修改考试申请信息!",
- });
- return;
- }
+ beforeOpen(done, type) {
+ if (this.userInfo.role_name == "培训公司管理员") {
+ if (["edit"].includes(type)) {
+ if (this.form.auditStatus == 1) {
+ this.$message({
+ type: "warning",
+ message: "当前考试申请已审核通过,无法再修改考试申请信息!"
+ });
+ return;
}
+ }
}
done();
},
@@ -736,7 +729,7 @@
if (row.examType == 1) {
this.$router.push({
path: `/applydetailed`,
- query: row,
+ query: row
});
}
@@ -744,7 +737,7 @@
if (row.examType == 2) {
this.$router.push({
path: `/trainApply`,
- query: row,
+ query: row
});
}
},
@@ -753,7 +746,7 @@
if (row.examType == 2) {
this.$router.push({
path: `/trainExam/singleperformance`,
- query: row,
+ query: row
});
}
},
@@ -768,11 +761,11 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -785,7 +778,7 @@
const data = {
id: row.id,
startTime: row.startTime + ":00",
- endTime: row.endTime + ":00",
+ endTime: row.endTime + ":00"
};
// row.startTime = row.startTime + ":00";
// row.endTime = row.endTime + ":00";
@@ -796,11 +789,11 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -810,7 +803,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -819,7 +812,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -827,7 +820,7 @@
this.$confirm("已确认当前考试申请人员名单无误?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
row["confirmUser"] = this.userInfo.Id;
@@ -837,7 +830,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -849,7 +842,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -858,7 +851,7 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.questionBankCrud.toggleSelection();
});
@@ -866,8 +859,8 @@
handleAudit(row) {
this.dialogFormVisible = true;
this.Audit = row;
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/trainExam/modifiedGrades.vue b/src/views/trainExam/modifiedGrades.vue
index c9e2455..447a3d8 100644
--- a/src/views/trainExam/modifiedGrades.vue
+++ b/src/views/trainExam/modifiedGrades.vue
@@ -1,91 +1,74 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-05 16:31:54
- * @Last Modified by: liu
- * @Last Modified time: 2021-11-23 13:55:09
- * menu-name 成绩修改管理
- */
+/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
+@Last Modified time: 2021-11-23 13:55:09 * menu-name 成绩修改管理 */
<template>
- <el-row class="morpheus-box">
- <el-col
- :span="24"
- :class="[
- 'recruitmentManagement',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ v-model="obj"
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ :permission="permissionList"
+ ref="questionBankCrud"
+ :page.sync="questionBankPage"
+ @on-load="questionBankOnLoad"
+ @selection-change="selectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-update="questionBankRowUpdate"
+ @refresh-change="refreshChange"
>
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '',
- ]"
- >
- <avue-crud
- v-model="obj"
- class="company-box"
- :option="questionBankOption"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- :permission="permissionList"
- ref="questionBankCrud"
- :page.sync="questionBankPage"
- @on-load="questionBankOnLoad"
- @selection-change="selectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-update="questionBankRowUpdate"
- @refresh-change="refreshChange"
- >
- <template slot-scope="{ row }" slot="status">
- <el-tag class="dtype">
- {{
- row.status == 2
- ? "审核通过"
- : row.status == 3
- ? "审核不通过"
- : "待审核"
- }}
- <i class="zc" v-if="row.status == 2"></i>
- <i class="yj" v-if="row.status == 3"></i>
- <i class="gz" v-if="row.status == 1"></i>
- </el-tag>
- </template>
- <!-- 自定义按钮 -->
- <template slot="menuLeft">
- <el-button
- type="primary"
- size="small"
- plain
- v-if="checks"
- icon="el-icon-collection-tag"
- @click="handleBatchAudit"
- >批量审批
- </el-button>
- <!--图例 components-->
- <span>
- <Legend :datas="datalistLIU"></Legend>
- </span>
- </template>
+ <template slot-scope="{ row }" slot="status">
+ <el-tag class="dtype">
+ {{
+ row.status == 2
+ ? "审核通过"
+ : row.status == 3
+ ? "审核不通过"
+ : "待审核"
+ }}
+ <i class="zc" v-if="row.status == 2"></i>
+ <i class="yj" v-if="row.status == 3"></i>
+ <i class="gz" v-if="row.status == 1"></i>
+ </el-tag>
+ </template>
+ <!-- 自定义按钮 -->
+ <template slot="menuLeft">
+ <el-button
+ type="primary"
+ size="small"
+ plain
+ v-if="checks"
+ icon="el-icon-collection-tag"
+ @click="handleBatchAudit"
+ >批量审批
+ </el-button>
+ <!--图例 components-->
+ <span>
+ <Legend :datas="datalistLIU"></Legend>
+ </span>
+ </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- :type="type"
- :size="size"
- icon="el-icon-folder-checked"
- v-if="permission.score_audit_check || check"
- @click="handleAudit(row)"
- >审核
- </el-button>
- </template>
- </avue-crud>
- </div>
- </el-card>
- </el-col>
-
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ :type="type"
+ :size="size"
+ icon="el-icon-folder-checked"
+ v-if="permission.score_audit_check || check"
+ @click="handleAudit(row)"
+ >审核
+ </el-button>
+ </template>
+ </avue-crud>
<el-dialog
title="成绩修改审核"
:visible.sync="dialogFormVisible"
@@ -108,15 +91,15 @@
width="900px"
@close="closeDialog"
>
- <avue-form
- ref="formBatchAudit"
- v-model="batchAudit"
- :option="optionBatchAudit"
- @reset-change="emptytChange"
- @submit="submitBatchAudit"
- ></avue-form>
+ <avue-form
+ ref="formBatchAudit"
+ v-model="batchAudit"
+ :option="optionBatchAudit"
+ @reset-change="emptytChange"
+ @submit="submitBatchAudit"
+ ></avue-form>
</el-dialog>
- </el-row>
+ </basic-container>
</template>
<script>
@@ -124,14 +107,14 @@
getList,
update,
applyAudit,
- batchAudit,
+ batchAudit
} from "@/api/examapi/modifiedGrades";
import { mapGetters } from "vuex";
import { getRoleDetail } from "@/api/system/role";
import Legend from "@/components/liu-legend/Legend";
export default {
components: {
- Legend,
+ Legend
},
data() {
return {
@@ -139,22 +122,22 @@
datalistLIU: [
{
color: "#29C093",
- text: "审核通过",
+ text: "审核通过"
},
{
color: "#F34A4A",
- text: "审核不通过",
+ text: "审核不通过"
},
{
color: "#F48F57",
- text: "待审核",
- },
+ text: "待审核"
+ }
],
Audit: {},
dialogFormVisible: false,
dialogBatchAudit: false,
batchAudit: {
- number: 0,
+ number: 0
},
optionBatchAudit: {
height: "auto",
@@ -180,7 +163,7 @@
span: 24,
value: 0,
disabled: true,
- labelWidth: 110,
+ labelWidth: 110
},
{
label: "审核状态",
@@ -196,31 +179,31 @@
{
required: true,
message: "请选择审核类型",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
span: 24,
type: "textarea",
- prop: "auditDetail",
- },
- ],
+ prop: "auditDetail"
+ }
+ ]
},
choiceList: [],
optionAudit: {
@@ -256,34 +239,34 @@
{
required: true,
message: "请选择审核类型",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
- ],
+ value: 3
+ }
+ ]
},
{
label: "审核明细",
span: 24,
type: "textarea",
- prop: "auditDetail",
- },
- ],
+ prop: "auditDetail"
+ }
+ ]
},
obj: {
- name: "张三",
+ name: "张三"
},
questionBankOption: {
// 操作栏多余按钮去除
@@ -317,7 +300,7 @@
prop: "examTime",
search: true,
searchSpan: 4,
- type:"date",
+ type: "date",
format: "yyyy-MM-dd",
valueFormat: "yyyy-MM-dd",
viewDisplay: true,
@@ -338,11 +321,11 @@
{
required: true,
message: "请输入试卷名称",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
width: 90,
- overHidden:true,
+ overHidden: true
},
{
label: "姓名",
@@ -368,10 +351,10 @@
{
required: true,
message: "请输入试卷名称",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 80,
+ width: 80
// overHidden:true,
},
@@ -402,11 +385,11 @@
{
required: true,
message: "请输入所属公司",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
width: 200,
- overHidden:true
+ overHidden: true
},
{
@@ -431,10 +414,10 @@
{
required: true,
message: "请输入保安姓名",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 140,
+ width: 140
},
{
@@ -453,13 +436,12 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 88,
-
+ width: 88
},
{
label: "修改后理论成绩",
- width:110,
+ width: 110,
prop: "newScore",
slot: true,
// 表单新增时是否禁止
@@ -478,28 +460,28 @@
{
required: true,
message: "请输入修改后理论成绩",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "笔试答题图片",
prop: "url",
- labelWidth:110,
- type: 'upload',
- dataType: 'string',
- width:98,
+ labelWidth: 110,
+ type: "upload",
+ dataType: "string",
+ width: 98,
span: 24,
- limit:5,
- listType: 'picture-card',
- disabled:true,
- tip: '只能上传jpg/png文件,最多上传5张',
+ limit: 5,
+ listType: "picture-card",
+ disabled: true,
+ tip: "只能上传jpg/png文件,最多上传5张",
propsHttp: {
- res: 'data',
+ res: "data",
url: "url"
},
- action: "/api/blade-resource/oss/endpoint/put-files",
+ action: "/api/blade-resource/oss/endpoint/put-files"
},
{
@@ -520,9 +502,9 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- width:200,
+ width: 200,
editDetail: false,
- overHidden: true,
+ overHidden: true
},
{
label: "申请理由",
@@ -540,8 +522,8 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- minWidth:70,
- overHidden:true
+ minWidth: 70,
+ overHidden: true
},
{
@@ -565,7 +547,7 @@
// 表单编辑时是否为查看模式
editDetail: false,
viewDisplay: false,
- width: 130,
+ width: 130
},
{
@@ -589,7 +571,7 @@
// 表单编辑时是否为查看模式
editDetail: false,
viewDisplay: false,
- width: 130,
+ width: 130
},
{
@@ -602,16 +584,16 @@
dicData: [
{
label: "待审核",
- value: 1,
+ value: 1
},
{
label: "审核通过",
- value: 2,
+ value: 2
},
{
label: "审核不通过",
- value: 3,
- },
+ value: 3
+ }
],
// 表单新增时是否禁止
addDisabled: false,
@@ -625,7 +607,7 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 110,
+ width: 110
},
{
@@ -644,9 +626,9 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 68,
- },
- ],
+ width: 68
+ }
+ ]
},
questionBankSearch: {},
questionBankLoading: true,
@@ -655,10 +637,10 @@
pageSize: 10,
currentPage: 1,
total: 16,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
questionBankQuery: {},
- questionBankSelectionList: [],
+ questionBankSelectionList: []
};
},
created() {
@@ -674,11 +656,11 @@
//判断是否为超级管理员
if (this.userInfo.role_name == "administrator") {
this.checks = true;
- this.questionBankOption.tip = true
+ this.questionBankOption.tip = true;
}
},
mounted() {
-
+ this.$store.commit("setWindowSizeHeightAdd");
},
computed: {
...mapGetters(["userInfo", "permission"]),
@@ -687,9 +669,9 @@
addBtn: this.vaildData(null, false),
viewBtn: this.vaildData(this.permission.score_audit_view, false),
delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(this.permission.score_audit_edit, false),
+ editBtn: this.vaildData(this.permission.score_audit_edit, false)
};
- },
+ }
},
methods: {
getNewTime() {
@@ -749,7 +731,7 @@
id: row.id,
status: row.status,
auditDetail: row.auditDetail,
- auditUser: this.userInfo.Id,
+ auditUser: this.userInfo.Id
};
applyAudit(data).then(
@@ -758,11 +740,11 @@
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -773,7 +755,7 @@
if (this.choiceList.length == 0) {
this.$message({
message: "未选择考试的人员",
- type: "warning",
+ type: "warning"
});
return;
}
@@ -785,7 +767,7 @@
this.choiceList = [];
for (let k in list) {
this.choiceList.push({
- id: list[k].id,
+ id: list[k].id
});
}
},
@@ -794,8 +776,8 @@
var that = this;
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
+ roleIds.forEach(roleId => {
+ getRoleDetail(roleId).then(res => {
var roleAlias = res.data.data.roleAlias;
if (roleAlias == "保安公司管理员" || roleAlias == "保安") {
//如果是保安公司管理员
@@ -814,11 +796,12 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.questionBankQuery)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
that.questionBankPage.total = data.total;
that.questionBankData = data.records;
that.questionBankLoading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
that.questionBankSelectionClear();
});
});
@@ -852,17 +835,17 @@
questionBankRowUpdate(row, index, done, loading) {
update({
id: row.id,
- newScore: row.newScore,
+ newScore: row.newScore
}).then(
() => {
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -883,7 +866,7 @@
ids: str,
status: row.status,
auditDetail: row.auditDetail,
- auditUser: this.userInfo.Id,
+ auditUser: this.userInfo.Id
};
//提交申请
batchAudit(data).then(
@@ -893,13 +876,13 @@
that.dialogBatchAudit = false;
this.$message({
type: "success",
- message: "操作成功",
+ message: "操作成功"
});
//清除选项
that.$refs.questionBankCrud.toggleSelection();
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -907,8 +890,8 @@
},
refreshChange() {
this.questionBankOnLoad(this.questionBankPage, this.questionBankQuery);
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/trainExam/performance.vue b/src/views/trainExam/performance.vue
index 0f366ca..5eb320a 100644
--- a/src/views/trainExam/performance.vue
+++ b/src/views/trainExam/performance.vue
@@ -1,166 +1,161 @@
/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
@Last Modified time: 2021-11-27 10:20:19 * menu-name 成绩管理 */
<template>
- <el-row class="morpheus-box">
- <el-col :span="24">
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'tooRowSearch' : ''
- ]"
- >
- <avue-crud
- v-model="obj"
- class="company-box"
- :option="questionBankOption"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- :permission="permissionList"
- ref="questionBankCrud"
- :page.sync="questionBankPage"
- @sort-change="sortChange"
- @on-load="questionBankOnLoad"
- @selection-change="questionBankSelectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-update="questionBankRowUpdate"
- @refresh-change="refreshChange"
- >
- <template slot-scope="{ row }" slot="theoryGrade">
- {{ row.theoryGrade }}
- </template>
- <template slot-scope="{ row }" slot="learnGrade">
- {{ row.learnGrade == "" ? "暂未录入" : row.learnGrade }}
- </template>
- <template slot-scope="{ row }" slot="allGrade">
- {{ row.allGrade == -1 ? "" : row.allGrade }}
- </template>
- <template slot-scope="{ row }" slot="qualified">
- {{
- row.qualified == ""
- ? ""
- : row.qualified == 0
- ? "合格"
- : row.qualified == 1
- ? "不合格"
- : row.qualified == 3
- ? "缺考,成绩无效"
- : ""
- }}
- </template>
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ v-model="obj"
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ :permission="permissionList"
+ ref="questionBankCrud"
+ :page.sync="questionBankPage"
+ @sort-change="sortChange"
+ @on-load="questionBankOnLoad"
+ @selection-change="questionBankSelectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-update="questionBankRowUpdate"
+ @refresh-change="refreshChange"
+ >
+ <template slot-scope="{ row }" slot="theoryGrade">
+ {{ row.theoryGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="learnGrade">
+ {{ row.learnGrade == "" ? "暂未录入" : row.learnGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="allGrade">
+ {{ row.allGrade == -1 ? "" : row.allGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="qualified">
+ {{
+ row.qualified == ""
+ ? ""
+ : row.qualified == 0
+ ? "合格"
+ : row.qualified == 1
+ ? "不合格"
+ : row.qualified == 3
+ ? "缺考,成绩无效"
+ : ""
+ }}
+ </template>
- <!-- 自定义按钮 -->
- <template slot="menuLeft">
- <!-- <el-button type="danger"
+ <!-- 自定义按钮 -->
+ <template slot="menuLeft">
+ <!-- <el-button type="danger"
size="mini"
icon="el-icon-delete"
plain
@click="handleDelete">新增
</el-button> -->
- <!-- <el-button type="danger"
+ <!-- <el-button type="danger"
size="mini"
icon="el-icon-delete"
plain
@click="handleDelete">删除
</el-button> -->
- <el-button
- type="success"
- size="small"
- plain
- icon="el-icon-upload2"
- v-if="permission.trainExam_performance_import"
- @click="handleImport"
- >实操成绩导入
- </el-button>
- <el-button
- type="warning"
- size="small"
- plain
- icon="el-icon-download"
- v-if="permission.trainExam_performance_export"
- @click="handleExport"
- >成绩导出
- </el-button>
- <el-button
- type="primary"
- size="small"
- plain
- v-if="permission.trainExam_performance_paper_apply"
- icon="el-icon-collection-tag"
- @click="handleSecurityPaperApply"
- >证书制证申请
- </el-button>
- <el-button
- type="primary"
- size="small"
- plain
- v-if="permission.trainExam_performance_worker_paper_apply"
- icon="el-icon-collection-tag"
- @click="handleWorkerPaperApply"
- >上岗证制证申请
- </el-button>
- </template>
+ <el-button
+ type="success"
+ size="small"
+ plain
+ icon="el-icon-upload2"
+ v-if="permission.trainExam_performance_import"
+ @click="handleImport"
+ >实操成绩导入
+ </el-button>
+ <el-button
+ type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ v-if="permission.trainExam_performance_export"
+ @click="handleExport"
+ >成绩导出
+ </el-button>
+ <el-button
+ type="primary"
+ size="small"
+ plain
+ v-if="permission.trainExam_performance_paper_apply"
+ icon="el-icon-collection-tag"
+ @click="handleSecurityPaperApply"
+ >证书制证申请
+ </el-button>
+ <el-button
+ type="primary"
+ size="small"
+ plain
+ v-if="permission.trainExam_performance_worker_paper_apply"
+ icon="el-icon-collection-tag"
+ @click="handleWorkerPaperApply"
+ >上岗证制证申请
+ </el-button>
+ </template>
- <template slot-scope="{ type, size, row }" slot="menu">
- <el-button
- style="display: none"
- icon="el-icon-s-flag"
- @click="absent(row)"
- :size="size"
- :type="type"
- >缺考标记</el-button
- >
- <el-button
- icon="el-icon-s-promotion"
- @click="openzhengjian(row)"
- :disabled="row.qualified != 0"
- :size="size"
- :type="type"
- >查看证件</el-button
- >
- <el-button
- icon="el-icon-edit"
- @click="modifiedGrades(row)"
- :size="size"
- :type="type"
- >申请修改成绩</el-button
- >
- <el-button
- icon="el-icon-edit"
- v-if="row.isPaper == 6"
- @click="securityPaperApply(row)"
- :size="size"
- :type="type"
- >补证申请</el-button
- >
- </template>
- </avue-crud>
+ <template slot-scope="{ type, size, row }" slot="menu">
+ <el-button
+ style="display: none"
+ icon="el-icon-s-flag"
+ @click="absent(row)"
+ :size="size"
+ :type="type"
+ >缺考标记</el-button
+ >
+ <el-button
+ icon="el-icon-s-promotion"
+ @click="openzhengjian(row)"
+ :disabled="row.qualified != 0"
+ :size="size"
+ :type="type"
+ >查看证件</el-button
+ >
+ <el-button
+ icon="el-icon-edit"
+ @click="modifiedGrades(row)"
+ :size="size"
+ :type="type"
+ >申请修改成绩</el-button
+ >
+ <el-button
+ icon="el-icon-edit"
+ v-if="row.isPaper == 6"
+ @click="securityPaperApply(row)"
+ :size="size"
+ :type="type"
+ >补证申请</el-button
+ >
+ </template>
+ </avue-crud>
- <el-dialog
- title="实操成绩导入"
- append-to-body
- :visible.sync="excelBox"
- width="555px"
- >
- <avue-form
- :option="excelOption"
- v-model="excelForm"
- :upload-after="uploadAfter"
- >
- <template slot="excelTemplate">
- <el-button type="primary" @click="handleTemplate">
- 点击下载<i class="el-icon-download el-icon--right"></i>
- </el-button>
- </template>
- </avue-form>
- </el-dialog>
- </div>
- </el-card>
- </el-col>
+ <el-dialog
+ title="实操成绩导入"
+ append-to-body
+ :visible.sync="excelBox"
+ width="555px"
+ >
+ <avue-form
+ :option="excelOption"
+ v-model="excelForm"
+ :upload-after="uploadAfter"
+ >
+ <template slot="excelTemplate">
+ <el-button type="primary" @click="handleTemplate">
+ 点击下载<i class="el-icon-download el-icon--right"></i>
+ </el-button>
+ </template>
+ </avue-form>
+ </el-dialog>
<el-dialog
title="申请修改成绩"
@@ -332,8 +327,7 @@
:closePrint="1"
></baoanz>
</div>
- <!-- </el-dialog> -->
- </el-row>
+ </basic-container>
</template>
<script>
@@ -660,7 +654,7 @@
label: "姓名",
prop: "securityName",
search: true,
- searchSpan: 4,
+ searchSpan: 3,
slot: true,
viewDisplay: true,
// 表单新增时是否禁止
@@ -674,6 +668,8 @@
viewDisabled: true,
// 表单编辑时是否可见
editDisplay: true,
+ searchLabelWidth: 50,
+ searchSpan: 3,
// 表单编辑时是否为查看模式
editDetail: false,
rules: [
@@ -837,7 +833,7 @@
type: "select",
slot: true,
search: true,
- searchSpan: 4,
+ searchSpan: 3,
width: 80,
dicData: [
{
@@ -944,7 +940,7 @@
slot: true,
hide: true,
search: true,
- searchSpan: 3,
+ searchSpan: 4,
width: 90,
dicData: [
{
@@ -1141,7 +1137,9 @@
};
},
created() {},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
computed: {
...mapGetters(["userInfo", "permission"]),
permissionList() {
@@ -1279,7 +1277,9 @@
return;
}
this.$confirm(
- "共选择上岗证制证申请人数" + this.choiceList.length + "人,确定申请制证?",
+ "共选择上岗证制证申请人数" +
+ this.choiceList.length +
+ "人,确定申请制证?",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
@@ -1407,6 +1407,7 @@
that.questionBankPage.total = data.total;
that.questionBankData = data.records;
that.questionBankLoading = false;
+ that.$store.commit("setWindowSizeHeightAdd");
that.questionBankSelectionClear();
});
});
diff --git a/src/views/trainExam/singleperformance.vue b/src/views/trainExam/singleperformance.vue
index 878fc07..28b2525 100644
--- a/src/views/trainExam/singleperformance.vue
+++ b/src/views/trainExam/singleperformance.vue
@@ -1,89 +1,82 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-05 16:31:54
- * @Last Modified by: liu
- * @Last Modified time: 2021-12-10 10:01:11
- * menu-name 成绩查看
- */
+/* * @Author: Morpheus * @Date: 2021-07-05 16:31:54 * @Last Modified by: liu *
+@Last Modified time: 2021-12-10 10:01:11 * menu-name 成绩查看 */
<template>
- <el-row class="morpheus-box-score">
- <el-col :span="24">
- <el-card>
- <div
- :class="[
- 'exam-card-body',
- $store.state.control.windowWidth >= 1024 ? 'tooRowSearch' : '',
- ]"
- >
- <avue-crud
- v-model="obj"
- class="company-box"
- :option="questionBankOption"
- :search.sync="questionBankSearch"
- :table-loading="questionBankLoading"
- :data="questionBankData"
- ref="questionBankCrud"
- @sort-change="sortChange"
- :permission="permissionList"
- :page.sync="questionBankPage"
- @on-load="questionBankOnLoad"
- @selection-change="questionBankSelectionChange"
- @search-change="questionBankSearchChange"
- @search-reset="questionBankSearchReset"
- @current-change="questionBankCurrentChange"
- @size-change="questionBankSizeChange"
- @row-update="questionBankRowUpdate"
- @refresh-change="refreshChange"
- >
- <template slot-scope="{ row }" slot="learnGrade">
- {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
- </template>
- <template slot-scope="{ row }" slot="theoryGrade">
- {{ row.theoryGrade == -1 ? "" : row.theoryGrade }}
- </template>
- <template slot-scope="{ row }" slot="allGrade">
- {{ row.allGrade == -1 ? "" : row.allGrade }}
- </template>
- <template slot-scope="{ row }" slot="qualified">
- {{
- row.qualified == -1
- ? ""
- : row.qualified == 0
- ? "合格"
- : row.qualified == 1
- ? "不合格"
- : row.qualified == 3
- ? "缺考,成绩无效"
- : ""
- }}
- </template>
+ <basic-container
+ :class="[
+ 'exam-card-body',
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
+ >
+ <avue-crud
+ v-model="obj"
+ class="company-box tablesss"
+ :option="questionBankOption"
+ :search.sync="questionBankSearch"
+ :table-loading="questionBankLoading"
+ :data="questionBankData"
+ ref="questionBankCrud"
+ @sort-change="sortChange"
+ :permission="permissionList"
+ :page.sync="questionBankPage"
+ @on-load="questionBankOnLoad"
+ @selection-change="questionBankSelectionChange"
+ @search-change="questionBankSearchChange"
+ @search-reset="questionBankSearchReset"
+ @current-change="questionBankCurrentChange"
+ @size-change="questionBankSizeChange"
+ @row-update="questionBankRowUpdate"
+ @refresh-change="refreshChange"
+ >
+ <template slot-scope="{ row }" slot="learnGrade">
+ {{ row.learnGrade == -1 ? "暂未录入" : row.learnGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="theoryGrade">
+ {{ row.theoryGrade == -1 ? "" : row.theoryGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="allGrade">
+ {{ row.allGrade == -1 ? "" : row.allGrade }}
+ </template>
+ <template slot-scope="{ row }" slot="qualified">
+ {{
+ row.qualified == -1
+ ? ""
+ : row.qualified == 0
+ ? "合格"
+ : row.qualified == 1
+ ? "不合格"
+ : row.qualified == 3
+ ? "缺考,成绩无效"
+ : ""
+ }}
+ </template>
- <!-- 自定义按钮 -->
- <template slot="menuLeft">
- <el-button
- type="warning"
- size="small"
- plain
- icon="el-icon-download"
- v-if="permission.trainExam_singleperformance_export"
- @click="handleExport"
- >成绩导出
- </el-button>
- </template>
- <template slot-scope="{ row }" slot="menu">
- <el-button
- type="text"
- size="mini"
- icon="el-icon-collection"
- class="start-kaoshi"
- :disabled="row.qualified == 1"
- @click="securityPrint(row)"
- >保安证打印
- </el-button>
- </template>
+ <!-- 自定义按钮 -->
+ <template slot="menuLeft">
+ <el-button
+ type="warning"
+ size="small"
+ plain
+ icon="el-icon-download"
+ v-if="permission.trainExam_singleperformance_export"
+ @click="handleExport"
+ >成绩导出
+ </el-button>
+ </template>
+ <template slot-scope="{ row }" slot="menu">
+ <el-button
+ type="text"
+ size="mini"
+ icon="el-icon-collection"
+ class="start-kaoshi"
+ :disabled="row.qualified == 1"
+ @click="securityPrint(row)"
+ >保安证打印
+ </el-button>
+ </template>
- <!-- 自定义按钮 -->
- <!-- <template slot="menuLeft">
+ <!-- 自定义按钮 -->
+ <!-- <template slot="menuLeft">
<el-button type="danger"
size="mini"
icon="el-icon-delete"
@@ -103,11 +96,8 @@
@click="handleDelete">导出
</el-button>
</template> -->
- </avue-crud>
- </div>
- </el-card>
- </el-col>
- </el-row>
+ </avue-crud>
+ </basic-container>
</template>
<script>
@@ -136,7 +126,7 @@
return {
obj: {
- name: "张三",
+ name: "张三"
},
questionBankOption: {
// 操作栏多余按钮去除
@@ -151,8 +141,8 @@
// title: '成绩',
align: "center",
height: "auto",
- sort:"",
- sortName:"",
+ sort: "",
+ sortName: "",
calcHeight: 80,
tip: false,
searchShow: true,
@@ -190,7 +180,7 @@
editDisplay: false,
// 表单编辑时是否为查看模式
editDetail: false,
- viewDisplay: false,
+ viewDisplay: false
},
{
label: "考试时间",
@@ -217,10 +207,10 @@
{
required: true,
message: "请输入考试时间",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- overHidden:true,
+ overHidden: true
},
{
label: "姓名",
@@ -247,17 +237,17 @@
{
required: true,
message: "请输入试卷名称",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 80,
+ width: 80
// overHidden:true,
},
{
label: "身份证号",
prop: "account",
search: true,
- searchSpan: 5,
+ searchSpan: 4,
slot: true,
// 表单新增时是否禁止
addDisabled: false,
@@ -275,10 +265,10 @@
{
required: true,
message: "请输入保安姓名",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 160,
+ width: 160
},
{
label: "准考证号",
@@ -302,10 +292,10 @@
{
required: true,
message: "请输入保安姓名",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- width: 140,
+ width: 140
},
{
label: "所属公司",
@@ -336,10 +326,10 @@
{
required: true,
message: "请输入所属公司",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- minWidth: 230,
+ minWidth: 230
},
{
label: "考试开始时间",
@@ -361,7 +351,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "考试结束时间",
@@ -383,7 +373,7 @@
// 表单编辑时是否可见
editDisplay: true,
// 表单编辑时是否为查看模式
- editDetail: false,
+ editDetail: false
},
{
label: "考试状态",
@@ -391,24 +381,24 @@
type: "select",
slot: true,
search: true,
- searchSpan: 4,
+ searchSpan: 3,
dicData: [
{
label: "发布成绩",
- value: 2,
+ value: 2
},
{
label: "考试中",
- value: 3,
+ value: 3
},
{
label: "纸质考试",
- value: 5,
+ value: 5
},
{
label: "缺考",
- value: 4,
- },
+ value: 4
+ }
],
width: 90,
// 表单新增时是否禁止
@@ -427,9 +417,9 @@
{
required: true,
message: "请输入考试名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "理论成绩",
@@ -448,7 +438,7 @@
editDisplay: true,
// 表单编辑时是否为查看模式
editDetail: false,
- width: 95,
+ width: 95
},
{
label: "实操成绩",
@@ -469,8 +459,8 @@
editDetail: false,
width: 95,
rules: [
- { validator: validatePass, required: true, trigger: "blur" },
- ],
+ { validator: validatePass, required: true, trigger: "blur" }
+ ]
},
{
label: "总成绩",
@@ -494,9 +484,9 @@
{
required: true,
message: "请输入考试名称",
- trigger: "blur",
- },
- ],
+ trigger: "blur"
+ }
+ ]
},
{
label: "是否合格",
@@ -510,16 +500,16 @@
dicData: [
{
label: "合格",
- value: 0,
+ value: 0
},
{
label: "不合格",
- value: 1,
+ value: 1
},
{
label: "暂未录实操成绩",
- value: 2,
- },
+ value: 2
+ }
],
// 表单新增时是否禁止
addDisabled: false,
@@ -537,11 +527,11 @@
{
required: true,
message: "请输入考试名称",
- trigger: "blur",
- },
- ],
- },
- ],
+ trigger: "blur"
+ }
+ ]
+ }
+ ]
},
questionBankSearch: {},
questionBankLoading: true,
@@ -550,10 +540,10 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
questionBankQuery: {},
- questionBankSelectionList: [],
+ questionBankSelectionList: []
};
},
created() {
@@ -561,7 +551,9 @@
this.questionBankSearch["examId"] = this.$route.query.id;
// console.log(this.$route.query,111);
},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
computed: {
...mapGetters(["userInfo", "permission"]),
permissionList() {
@@ -573,9 +565,9 @@
excelBtn: this.vaildData(
this.permission.trainExam_performance_export,
false
- ),
+ )
};
- },
+ }
},
methods: {
//保安证证查看
@@ -584,29 +576,29 @@
obj["name"] = "保安证";
this.$router.push({
path: `/exam/papers`,
- query: obj,
+ query: obj
});
},
//排序
sortChange(value) {
- if(value.order=="ascending"){
+ if (value.order == "ascending") {
this.sort = "asc";
}
- if(value.order=="descending"){
+ if (value.order == "descending") {
this.sort = "desc";
}
this.sortName = value.prop;
//字段匹配
- if(value.prop=="theoryGrade"){
+ if (value.prop == "theoryGrade") {
this.sortName = "theory_grade";
}
- if(value.prop=="learnGrade"){
+ if (value.prop == "learnGrade") {
this.sortName = "learn_grade";
}
- if(value.prop=="allGrade"){
+ if (value.prop == "allGrade") {
this.sortName = "all_grade";
}
- if(value.prop=="companyName"){
+ if (value.prop == "companyName") {
this.sortName = "companyName";
}
this.questionBankOnLoad(this.questionBankPage);
@@ -617,8 +609,8 @@
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
params = this.questionBankSearch;
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
+ roleIds.forEach(roleId => {
+ getRoleDetail(roleId).then(res => {
var roleAlias = res.data.data.roleAlias;
if (
roleAlias == "保安公司管理员" ||
@@ -634,21 +626,22 @@
}
that.questionBankLoading = false;
params["examType"] = 2;
- if(this.sort){
+ if (this.sort) {
params["sort"] = this.sort;
}
- if(this.sortName){
+ if (this.sortName) {
params["sortName"] = this.sortName;
}
getList(
page.currentPage,
page.pageSize,
Object.assign(params, this.questionBankQuery)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
that.questionBankPage.total = data.total;
that.questionBankData = data.records;
that.questionBankLoading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
that.questionBankSelectionClear();
});
});
@@ -682,17 +675,17 @@
update({
theoryGrade: row.theoryGrade,
learnGrade: row.learnGrade,
- id: row.id,
+ id: row.id
}).then(
() => {
this.questionBankOnLoad(this.questionBankPage);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -706,7 +699,7 @@
this.$confirm("是否导出成绩数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
//获取查询条件
// console.log(this.questionBankSearch,456);
@@ -717,7 +710,7 @@
isExam: this.questionBankSearch.isExam,
qualified: this.questionBankSearch.qualified,
securityName: this.questionBankSearch.securityName,
- examId:this.questionBankSearch.examId,
+ examId: this.questionBankSearch.examId
};
//导出
if (
@@ -732,18 +725,18 @@
data["trainUnitId"] = this.userInfo.dept_id;
}
data["examType"] = 2;
- console.log(data,1234567989);
+ console.log(data, 1234567989);
//序列号url形式，用&拼接
data = Qs.stringify(data);
- window.open(`/api/examScore/export-examScore?${
+ window.open(
+ `/api/examScore/export-examScore?${
this.website.tokenHeader
}=${getToken()}&` + data
);
});
- },
- },
+ }
+ }
};
</script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/views/traincompany/index.vue b/src/views/traincompany/index.vue
index 2998845..e0dd316 100644
--- a/src/views/traincompany/index.vue
+++ b/src/views/traincompany/index.vue
@@ -1,15 +1,14 @@
-/*
- * @Author: Morpheus
- * @Date: 2021-07-07 17:30:05
- * @Last Modified by: liu
- * @Last Modified time: 2021-12-10 09:56:51
- * menu-name 保安培训报名
- */
+/* * @Author: Morpheus * @Date: 2021-07-07 17:30:05 * @Last Modified by: liu *
+@Last Modified time: 2021-12-10 09:56:51 * menu-name 保安培训报名 */
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -73,11 +72,11 @@
getDetail,
add,
update,
- remove,
+ remove
} from "@/api/securityCompany/train";
import {
adddata,
- batchTrain,
+ batchTrain
} from "@/api/trainingRegistration/trainingRegistration";
import { mapGetters } from "vuex";
import { mapState } from "vuex";
@@ -88,7 +87,7 @@
form: {},
auditStatus: false,
formTrainApply: {
- num: 0,
+ num: 0
},
query: {},
deptId: null,
@@ -98,7 +97,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -128,7 +127,7 @@
search: true,
searchSpan: 5,
searchLabelWidth: 60,
- display: false,
+ display: false
},
{
label: "校长",
@@ -137,26 +136,26 @@
search: true,
searchSpan: 4,
searchLabelWidth: 60,
- width: 120,
+ width: 120
},
{
label: "负责人",
prop: "contacts",
- display: false,
+ display: false
},
{
label: "联系方式",
prop: "contactscell",
display: false,
- width: 130,
+ width: 130
},
{
label: "联系地址",
prop: "address",
display: false,
- width: 280,
- },
- ],
+ width: 280
+ }
+ ]
},
optionTrainApply: {
align: "center",
@@ -179,7 +178,7 @@
cascaderItem: ["trainExamId"],
props: {
label: "title",
- value: "id",
+ value: "id"
},
type: "select",
disabled: true,
@@ -187,14 +186,14 @@
{
required: true,
message: "请输入学校",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
hide: true,
searchSpan: 6,
searchLabelWidth: 110,
search: true,
- span: 24,
+ span: 24
},
// {
// label: "企业名称",
@@ -224,7 +223,7 @@
// dicUrl: "/api/blade-user/page-security-unit?deptId="+this.deptId,
props: {
label: "name",
- value: "id",
+ value: "id"
},
//不包含父节点值
leafOnly: true,
@@ -234,27 +233,27 @@
{
required: true,
message: "请输入姓名",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
- span: 24,
+ span: 24
},
{
label: "总数",
prop: "num",
disabled: true,
- span: 12,
- },
- ],
+ span: 12
+ }
+ ]
},
- data: [],
+ data: []
};
},
watch: {
"formTrainApply.userId"() {
// console.log(this.formTrainApply.userId.length,456);
this.formTrainApply.num = this.formTrainApply.userId.length;
- },
+ }
},
computed: {
...mapGetters(["permission"]),
@@ -263,19 +262,19 @@
addBtn: this.vaildData(null, false),
viewBtn: this.vaildData(null, false),
delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(null, false),
+ editBtn: this.vaildData(null, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
- }),
+ userInfo: state => state.user.userInfo
+ })
},
created() {
this.optionTrainApply.column[1].dicUrl =
@@ -284,11 +283,14 @@
this.getUserDetail();
},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
//获取用户信息
getUserDetail() {
var that = this;
- getUser(this.userInfo.Id).then((res) => {
+ getUser(this.userInfo.Id).then(res => {
var status = res.data.data.examinationType;
if (status == "1") {
that.auditStatus = true;
@@ -302,37 +304,37 @@
this.optionTrainApply.column.trainingUnitId = row.departmentid;
// this.deptId= this.userInfo.dept_id;
this.formTrainApply = {
- trainingUnitId: row.departmentid,
+ trainingUnitId: row.departmentid
};
},
//批量报名提交
submit() {
batchTrain({
userIds: this.formTrainApply.userId.join(","),
- trainingUnitId: this.formTrainApply.trainingUnitId,
+ trainingUnitId: this.formTrainApply.trainingUnitId
}).then(
- (res) => {
+ res => {
this.onLoad(this.page);
if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "已报名，不能重复报名",
+ message: "已报名，不能重复报名"
});
} else if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "报名失败",
+ message: "报名失败"
});
} else {
this.$message({
type: "success",
- message: "报名成功",
+ message: "报名成功"
});
this.$refs.formTrainApply.resetFields();
this.dialogDisable = false;
}
},
- (error) => {
+ error => {
window.console.log(error);
this.$refs.formTrainApply.resetFields();
this.dialogDisable = false;
@@ -344,32 +346,32 @@
this.$confirm("是否确定报名?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
row["userId"] = this.userInfo.user_id;
row["trainingUnitId"] = row.departmentid;
adddata(row).then(
- (res) => {
+ res => {
// this.onLoad(this.page);
if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "已报名，不能重复报名",
+ message: "已报名，不能重复报名"
});
} else if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "报名失败",
+ message: "报名失败"
});
} else {
this.$message({
type: "success",
- message: "报名成功",
+ message: "报名成功"
});
}
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -386,11 +388,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -402,11 +404,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -416,7 +418,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -425,13 +427,13 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -469,14 +471,15 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
+ }
// // 行单击
// handleRowClick(row) {
@@ -488,9 +491,8 @@
// query: obj,
// });
// },
- },
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/trainingRegistration/index.vue b/src/views/trainingRegistration/index.vue
index b7c5ae3..9c7c4f8 100644
--- a/src/views/trainingRegistration/index.vue
+++ b/src/views/trainingRegistration/index.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
v-if="visibles"
:option="option"
:table-loading="loading"
@@ -137,7 +141,7 @@
update,
remove,
cancelTrain,
- addExam,
+ addExam
} from "@/api/trainingRegistration/trainingRegistration";
import { mapGetters } from "vuex";
import { getRoleDetail } from "@/api/system/role";
@@ -154,7 +158,7 @@
dialogExamFormVisible: false,
search: {},
examApply: {
- number: 0,
+ number: 0
},
optionExamApply: {
height: "auto",
@@ -180,7 +184,7 @@
span: 24,
value: 0,
disabled: true,
- labelWidth: 110,
+ labelWidth: 110
},
// {
// label: "序号开始",
@@ -248,11 +252,11 @@
{
required: true,
message: "请选择考试时间",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
span: 12,
- labelWidth: 110,
+ labelWidth: 110
},
{
label: "考试开始截止时间",
@@ -276,13 +280,13 @@
{
required: true,
message: "请选择考试时间",
- trigger: "blur",
- },
+ trigger: "blur"
+ }
],
span: 12,
- labelWidth: 140,
- },
- ],
+ labelWidth: 140
+ }
+ ]
},
excelForm: {},
excelOption: {
@@ -297,25 +301,25 @@
loadText: "模板上传中，请稍等",
span: 24,
propsHttp: {
- res: "data",
+ res: "data"
},
tip: "请上传 .xls,.xlsx 标准格式文件",
- action: "/api/trainingRegistration/import-trainingRegistration",
+ action: "/api/trainingRegistration/import-trainingRegistration"
},
{
label: "模板下载",
prop: "excelTemplate",
formslot: true,
- span: 24,
- },
- ],
+ span: 24
+ }
+ ]
},
selectionList: [],
page: {
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
query: {},
data: [],
@@ -343,14 +347,14 @@
delBtn: false,
editBtn: false,
addBtn: false,
- ...this.$store.state.control.clearOtherBut,
- },
+ ...this.$store.state.control.clearOtherBut
+ }
};
},
computed: {
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
@@ -361,26 +365,16 @@
addBtn: this.vaildData(this.permission.notice_add, false),
viewBtn: this.vaildData(this.permission.notice_view, false),
delBtn: this.vaildData(this.permission.notice_delete, false),
- editBtn: this.vaildData(this.permission.notice_edit, false),
+ editBtn: this.vaildData(this.permission.notice_edit, false)
};
- },
+ }
},
created() {
this.search["cancel"] = 1;
this.search["auditStatus"] = 4;
this.search["isExam"] = 1;
},
- watch: {
- windowHeight() {
- // console.log(this.windowHeight, "windowHeight");
- this.option.height = this.windowHeight - 320;
- this.visibles = false;
- this.$nextTick(() => {
- this.visibles = true;
- this.refreshChange();
- });
- },
- },
+
mounted() {
// if (window.name == "baoming") {
// let old = JSON.parse(window.localStorage.getItem("baoming"));
@@ -391,6 +385,7 @@
// window.name = "baoming";
// console.log("不刷新");
// }
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
//报名信息导出
@@ -398,7 +393,7 @@
this.$confirm("是否导出报名信息数据?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
//获取查询条件
// const { releaseTimeRange } = this.questionBankSearch;
@@ -411,7 +406,7 @@
auditStatus: this.search.auditStatus,
deptName: this.search.deptName,
isExam: this.search.isExam,
- realName: this.search.realName,
+ realName: this.search.realName
};
if (
this.userInfo.role_name == "保安公司管理员" ||
@@ -440,7 +435,7 @@
obj["name"] = "准考证信息";
this.$router.push({
path: `/applyexam/papers`,
- query: obj,
+ query: obj
});
},
sizeChange(val) {
@@ -454,27 +449,27 @@
rowSave(form, done, loading) {
var that = this;
adddata(form).then(
- (res) => {
+ res => {
this.onLoad(this.page);
if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "已报名，不能重复报名",
+ message: "已报名，不能重复报名"
});
} else if (res.data.data == 201) {
this.$message({
type: "warning",
- message: "报名失败",
+ message: "报名失败"
});
} else {
this.$message({
type: "success",
- message: "报名成功",
+ message: "报名成功"
});
}
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -496,11 +491,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -511,7 +506,7 @@
this.$confirm("确认报名?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
row.cancel = 3;
update(row).then(
@@ -519,11 +514,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "确认报名成功!",
+ message: "确认报名成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -534,7 +529,7 @@
this.$confirm("确定取消报名?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
}).then(() => {
row.cancel = 2;
cancelTrain(row).then(
@@ -542,11 +537,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "取消报名成功!",
+ message: "取消报名成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -557,7 +552,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -566,7 +561,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -577,7 +572,7 @@
for (let k in list) {
this.choiceName.push({
label: list[k].realName,
- value: list[k].id,
+ value: list[k].id
});
}
@@ -592,7 +587,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -601,7 +596,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crudrec.toggleSelection();
});
@@ -616,8 +611,8 @@
//获取当前登录人员的角色信息
var roleIds = this.userInfo.role_id.split(",");
params = this.search;
- roleIds.forEach((roleId) => {
- getRoleDetail(roleId).then((res) => {
+ roleIds.forEach(roleId => {
+ getRoleDetail(roleId).then(res => {
var roleAlias = res.data.data.roleAlias;
if (
roleAlias == "保安公司管理员" ||
@@ -636,12 +631,13 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
// console.log(res);
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
// console.log(this.data);
+ this.$store.commit("setWindowSizeHeightAdd");
this.loading = false;
});
});
@@ -666,7 +662,7 @@
if (this.choiceName.length == 0) {
this.$message({
message: "未选择保安员",
- type: "warning",
+ type: "warning"
});
return;
}
@@ -731,12 +727,12 @@
that.dialogExamFormVisible = false;
this.$message({
type: "success",
- message: "操作成功",
+ message: "操作成功"
});
this.$refs.crud.toggleSelection();
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -745,10 +741,9 @@
//关闭窗口清除数据
closeDialog() {
this.$refs.formExamApply.resetFields();
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/workreport/workreply.vue b/src/views/workreport/workreply.vue
index 64f0386..cc1695b 100644
--- a/src/views/workreport/workreply.vue
+++ b/src/views/workreport/workreply.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -49,7 +53,7 @@
remove,
update,
add,
- getDetail,
+ getDetail
} from "@/api/workreport/workreport";
import { getDept } from "@/api/system/dept";
import { mapGetters } from "vuex";
@@ -71,7 +75,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -93,9 +97,9 @@
menuWidth: 320,
dialogClickModal: false,
column: workreplyColumn,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
- data: [],
+ data: []
};
},
computed: {
@@ -105,18 +109,20 @@
addBtn: this.vaildData(null, false),
viewBtn: this.vaildData(this.permission.workreply_view, false),
delBtn: this.vaildData(null, false),
- editBtn: this.vaildData(this.permission.workreply_edit, false),
+ editBtn: this.vaildData(this.permission.workreply_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
rowSave(row, done, loading) {
row.category = 1;
@@ -126,11 +132,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -142,11 +148,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -156,7 +162,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -165,7 +171,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -194,7 +200,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -203,14 +209,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -235,7 +241,7 @@
).content.user_id;
var that = this;
- getDept(this.deptId).then((res) => {
+ getDept(this.deptId).then(res => {
var deptCategory = res.data.data.deptCategory;
deptCategory == 1
? (that.deptCategory = true)
@@ -247,7 +253,7 @@
params["userId"] = this.userId;
// }
let values = {
- ...params,
+ ...params
};
// if (releaseTimeRange) {
// values = {
@@ -259,20 +265,18 @@
// values.releaseTimeRange = null;
// }
this.loading = true;
- getListPageReply(page.currentPage, page.pageSize, values).then(
- (res) => {
- const data = res.data.data;
- this.page.total = data.total;
- this.data = data.records;
- this.loading = false;
- this.selectionClear();
- }
- );
+ getListPageReply(page.currentPage, page.pageSize, values).then(res => {
+ const data = res.data.data;
+ this.page.total = data.total;
+ this.data = data.records;
+ this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
+ this.selectionClear();
+ });
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
diff --git a/src/views/workreport/workreport.vue b/src/views/workreport/workreport.vue
index 5dd2525..12c4a2b 100644
--- a/src/views/workreport/workreport.vue
+++ b/src/views/workreport/workreport.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -50,7 +54,7 @@
remove,
update,
add,
- getDetail,
+ getDetail
} from "@/api/workreport/workreport";
import { getDept } from "@/api/system/dept";
import { mapGetters } from "vuex";
@@ -72,7 +76,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -94,9 +98,9 @@
menuWidth: 320,
dialogClickModal: false,
column: workreportColumn,
- ...this.$store.state.control.clearOtherBut,
+ ...this.$store.state.control.clearOtherBut
},
- data: [],
+ data: []
};
},
computed: {
@@ -106,21 +110,23 @@
addBtn: this.vaildData(this.permission.workreport_add, false),
viewBtn: this.vaildData(this.permission.workreport_view, false),
delBtn: this.vaildData(this.permission.workreport_delete, false),
- editBtn: this.vaildData(this.permission.workreport_edit, false),
+ editBtn: this.vaildData(this.permission.workreport_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
},
...mapState({
- userInfo: (state) => state.user.userInfo,
- }),
+ userInfo: state => state.user.userInfo
+ })
},
- mounted() {},
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
+ },
methods: {
rowSave(row, done, loading) {
row.receivedIds = row.receivedIds.join(",");
@@ -131,11 +137,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -150,11 +156,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
window.console.log(error);
loading();
}
@@ -164,7 +170,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -173,7 +179,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -202,7 +208,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -211,14 +217,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -256,10 +262,10 @@
) {
const column = that.findObject(that.option.column, "category");
var code = {
- code: "securityWorkReportCategory",
+ code: "securityWorkReportCategory"
};
- getDictionaryBiz(code).then((res) => {
+ getDictionaryBiz(code).then(res => {
// column.dicUrl = "/api/blade-system/dict-biz/dictionary?code=securityWorkReportCategory";
column.dicData = res.data.data;
const columnReceivedIds = that.findObject(
@@ -275,21 +281,22 @@
// }
let values = {
- ...params,
+ ...params
};
this.loading = true;
- getListPage(page.currentPage, page.pageSize, values).then((res) => {
+ getListPage(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
});
} else if (this.userInfo.role_name == "公安管理员") {
const column = that.findObject(that.option.column, "category");
var code1 = { code: "workReportCategory" };
- getDictionaryBiz(code1).then((res) => {
+ getDictionaryBiz(code1).then(res => {
// column.dicUrl = "/api/blade-system/dict-biz/dictionary?code=workReportCategory";
column.dicData = res.data.data;
const columnReceivedIds = that.findObject(
@@ -305,28 +312,30 @@
// }
let values = {
- ...params,
+ ...params
};
this.loading = true;
- getListPage(page.currentPage, page.pageSize, values).then((res) => {
+ getListPage(page.currentPage, page.pageSize, values).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
});
} else if (this.userInfo.role_name == "administrator") {
- getListPage(page.currentPage, page.pageSize, params).then((res) => {
+ getListPage(page.currentPage, page.pageSize, params).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
}
- },
- },
+ }
+ }
};
</script>
diff --git a/src/views/zc/zc.vue b/src/views/zc/zc.vue
index 384943d..4e91383 100644
--- a/src/views/zc/zc.vue
+++ b/src/views/zc/zc.vue
@@ -1,8 +1,12 @@
<template>
<basic-container
- :class="[$store.state.control.windowWidth >= 1024 ? 'oneRowSearch' : '']"
+ :class="[
+ $store.state.control.screenSize == 1366 ? 'smallSize' : 'normalSize',
+ $store.state.control.windowWidth >= 1024 ? 'tooRowSearch1' : ''
+ ]"
>
<avue-crud
+ class="tablesss"
:option="option"
:table-loading="loading"
:data="data"
@@ -76,7 +80,7 @@
pageSize: 10,
currentPage: 1,
total: 0,
- ...this.$store.state.control.changePageSize,
+ ...this.$store.state.control.changePageSize
},
selectionList: [],
option: {
@@ -101,14 +105,14 @@
searchLabelWidth: 55,
search: true,
disabled: true,
- prop: "username",
+ prop: "username"
},
{
label: "密码",
hide: true,
editDisplay: false,
viewDisplay: false,
- prop: "password",
+ prop: "password"
},
{
label: "姓名",
@@ -117,19 +121,19 @@
searchSpan: 4,
searchLabelWidth: 55,
disabled: true,
- prop: "sname",
+ prop: "sname"
},
{
label: "身份证号",
disabled: true,
search: true,
display: false,
- prop: "cardid",
+ prop: "cardid"
},
{
label: "部门",
editDisplay: false,
- prop: "deptName",
+ prop: "deptName"
},
{
label: "角色",
@@ -138,8 +142,8 @@
dicData: [],
type: "tree",
props: {
- label: "title",
- },
+ label: "title"
+ }
},
{
label: "审核状态",
@@ -151,26 +155,26 @@
dicData: [
{
label: "未审核",
- value: "0",
+ value: "0"
},
{
label: "审核通过",
- value: "1",
+ value: "1"
},
{
label: "审核不通过",
- value: "2",
- },
- ],
- },
- ],
+ value: "2"
+ }
+ ]
+ }
+ ]
},
- data: [],
+ data: []
};
},
- created(){
- if(this.userInfo.role_name=="保安公司管理员"){
- this.search['type'] = "0";
+ created() {
+ if (this.userInfo.role_name == "保安公司管理员") {
+ this.search["type"] = "0";
}
},
computed: {
@@ -180,20 +184,23 @@
addBtn: this.vaildData(this.permission.zc_add, false),
viewBtn: this.vaildData(this.permission.zc_view, true),
delBtn: this.vaildData(this.permission.zc_delete, false),
- editBtn: this.vaildData(this.permission.zc_edit, false),
+ editBtn: this.vaildData(this.permission.zc_edit, false)
};
},
ids() {
let ids = [];
- this.selectionList.forEach((ele) => {
+ this.selectionList.forEach(ele => {
ids.push(ele.id);
});
return ids.join(",");
- },
+ }
+ },
+ mounted() {
+ this.$store.commit("setWindowSizeHeightAdd");
},
methods: {
initData(d) {
- getRoleTree().then((res) => {
+ getRoleTree().then(res => {
const column = this.findObject(this.option.column, "parentId");
var k = res.data.data;
var b = [];
@@ -220,11 +227,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
window.console.log(error);
}
@@ -236,11 +243,11 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
done();
},
- (error) => {
+ error => {
loading();
console.log(error);
}
@@ -250,7 +257,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(row.id);
@@ -259,7 +266,7 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
});
},
@@ -271,7 +278,7 @@
this.$confirm("确定将选择数据删除?", {
confirmButtonText: "确定",
cancelButtonText: "取消",
- type: "warning",
+ type: "warning"
})
.then(() => {
return remove(this.ids);
@@ -280,14 +287,14 @@
this.onLoad(this.page);
this.$message({
type: "success",
- message: "操作成功!",
+ message: "操作成功!"
});
this.$refs.crud.toggleSelection();
});
},
beforeOpen(done, type) {
if (["edit", "view"].includes(type)) {
- getDetail(this.form.id).then((res) => {
+ getDetail(this.form.id).then(res => {
this.form = res.data.data;
});
}
@@ -326,17 +333,17 @@
page.currentPage,
page.pageSize,
Object.assign(params, this.query)
- ).then((res) => {
+ ).then(res => {
const data = res.data.data;
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.$store.commit("setWindowSizeHeightAdd");
this.selectionClear();
});
- },
- },
+ }
+ }
};
</script>
-<style>
-</style>
+<style></style>
--
Gitblit v1.9.3