From 851c7991a711510f4b8fb3e970f7964f2e9105f2 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 07 Aug 2021 18:49:55 +0800
Subject: [PATCH] Merge branch 'master' of http://s16s652780.51mypc.cn:49896/r/zhba_regulatory
---
src/views/qualificationExamination/registrationTrainingQuery.vue | 3
src/views/securityGuardManagement/dispatchChildoperable.vue | 14 +-
src/views/commandQuery/taskDistribution.vue | 7 +
vue.config.js | 3
src/views/securityCompany/regulatoryInformation.vue | 8 +-
src/views/desk/notice.vue | 1
src/styles/element-ui.scss | 186 ++++++++++++++++++++++++---------------------
src/views/permit/permit.vue | 3
8 files changed, 122 insertions(+), 103 deletions(-)
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index 9ae380c..f06b902 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -417,96 +417,108 @@
.el-table th.is-leaf {
border: 1px solid transparent;
}
-//顶部搜索栏
-.el-card.is-never-shadow.avue-crud__search {
- position: absolute;
- width: calc(100% - 180px);
- z-index: 500;
- border: none !important;
- box-shadow: none !important;
-}
-.registersss .el-card.is-never-shadow.avue-crud__search {
- width: calc(100% - 360px) !important;
-}
-.users .el-card.is-never-shadow.avue-crud__search {
- width: calc(100% - 800px) !important;
- left: 630px;
-}
-//有按钮的
-// .dispatchChildoperable .el-card.is-never-shadow.avue-crud__search {
-// // left: 120px;
+// //顶部搜索栏
+// .el-card.is-never-shadow.avue-crud__search {
+// position: absolute;
+// width: calc(100% - 180px);
+// z-index: 500;
+// border: none !important;
+// box-shadow: none !important;
+// }
+// .registersss .el-card.is-never-shadow.avue-crud__search {
+// width: calc(100% - 360px) !important;
+// }
+// .users .el-card.is-never-shadow.avue-crud__search {
+// width: calc(100% - 800px) !important;
+// left: 630px;
+// }
+// //有按钮的
+// // .dispatchChildoperable .el-card.is-never-shadow.avue-crud__search {
+// // // left: 120px;
+// // width: calc(100% - 300px);
+// // }
+// .regulatoryInformation .el-card.is-never-shadow.avue-crud__search {
+// left: 120px;
// width: calc(100% - 300px);
// }
-.regulatoryInformation .el-card.is-never-shadow.avue-crud__search {
- left: 120px;
- width: calc(100% - 300px);
+// .notice .el-card.is-never-shadow.avue-crud__search {
+// left: 120px;
+// width: calc(100% - 300px);
+// }
+// .workreply .el-card.is-never-shadow.avue-crud__search {
+// left: 200px;
+// width: calc(100% - 380px);
+// }
+// .oos .el-card.is-never-shadow.avue-crud__search {
+// left: 200px;
+// width: calc(100% - 380px);
+// }
+// .role .el-card.is-never-shadow.avue-crud__search {
+// left: 280px;
+// width: calc(100% - 460px);
+// }
+// .dept .el-card.is-never-shadow.avue-crud__search {
+// left: 200px;
+// width: calc(100% - 380px);
+// }
+// .post .el-card.is-never-shadow.avue-crud__search {
+// left: 200px;
+// width: calc(100% - 380px);
+// }
+// .dict .el-card.is-never-shadow.avue-crud__search {
+// left: 200px;
+// width: calc(100% - 380px);
+// }
+// .dictbiz .el-card.is-never-shadow.avue-crud__search {
+// left: 200px;
+// width: calc(100% - 380px);
+// }
+// .menu .el-card.is-never-shadow.avue-crud__search {
+// left: 200px;
+// width: calc(100% - 380px);
+// }
+// .jurs .el-card.is-never-shadow.avue-crud__search {
+// left: 200px;
+// width: calc(100% - 380px);
+// }
+// .tenant .el-card.is-never-shadow.avue-crud__search {
+// width: calc(100% - 800px) !important;
+// left: 430px;
+// }
+// .company-box .el-card.is-never-shadow.avue-crud__search {
+// width: calc(100% - 100px) !important;
+// }
+// .permit .el-card.is-never-shadow.avue-crud__search {
+// width: calc(100% - 380px) !important;
+// left: 160px;
+// }
+// .avue-form {
+// position: relative;
+// top: 15px;
+// }
+// //顶部按钮栏
+// .avue-crud__menu {
+// height: 60px;
+// }
+// //顶部按钮
+// .avue-crud .avue-crud__left .el-button,
+// .avue-crud .avue-crud__right .el-button,
+// .avue-form .avue-crud__left .el-button,
+// .avue-form .avue-crud__right .el-button {
+// position: relative;
+// top: 15px;
+// }
+
+// 搜索栏按钮左移
+// .avue-form__group:nth-last-child() .el-form-item__content {
+// margin-left: 30px !important;
+// width: 165px !important;
+// }
+.avue-form__menu--center .el-button {
+ float: left;
}
-.notice .el-card.is-never-shadow.avue-crud__search {
- left: 120px;
- width: calc(100% - 300px);
-}
-.workreply .el-card.is-never-shadow.avue-crud__search {
- left: 200px;
- width: calc(100% - 380px);
-}
-.oos .el-card.is-never-shadow.avue-crud__search {
- left: 200px;
- width: calc(100% - 380px);
-}
-.role .el-card.is-never-shadow.avue-crud__search {
- left: 280px;
- width: calc(100% - 460px);
-}
-.dept .el-card.is-never-shadow.avue-crud__search {
- left: 200px;
- width: calc(100% - 380px);
-}
-.post .el-card.is-never-shadow.avue-crud__search {
- left: 200px;
- width: calc(100% - 380px);
-}
-.dict .el-card.is-never-shadow.avue-crud__search {
- left: 200px;
- width: calc(100% - 380px);
-}
-.dictbiz .el-card.is-never-shadow.avue-crud__search {
- left: 200px;
- width: calc(100% - 380px);
-}
-.menu .el-card.is-never-shadow.avue-crud__search {
- left: 200px;
- width: calc(100% - 380px);
-}
-.jurs .el-card.is-never-shadow.avue-crud__search {
- left: 200px;
- width: calc(100% - 380px);
-}
-.tenant .el-card.is-never-shadow.avue-crud__search {
- width: calc(100% - 800px) !important;
- left: 430px;
-}
-.company-box .el-card.is-never-shadow.avue-crud__search {
- width: calc(100% - 100px) !important;
-}
-.permit .el-card.is-never-shadow.avue-crud__search {
- width: calc(100% - 380px) !important;
- left: 160px;
-}
-.avue-form {
- position: relative;
- top: 15px;
-}
-//顶部按钮栏
-.avue-crud__menu {
- height: 60px;
-}
-//顶部按钮
-.avue-crud .avue-crud__left .el-button,
-.avue-crud .avue-crud__right .el-button,
-.avue-form .avue-crud__left .el-button,
-.avue-form .avue-crud__right .el-button {
- position: relative;
- top: 15px;
+.avue-form__menu--center .el-button:nth-child(1) {
+ margin-left: 30px;
}
//编辑弹窗上横线
diff --git a/src/views/commandQuery/taskDistribution.vue b/src/views/commandQuery/taskDistribution.vue
index 622df65..be261ff 100644
--- a/src/views/commandQuery/taskDistribution.vue
+++ b/src/views/commandQuery/taskDistribution.vue
@@ -110,8 +110,8 @@
label: "发送指令人",
prop: "sendName",
search: true,
- searchLabelWidth: 120,
- searchSpan: 5,
+ searchLabelWidth: 90,
+ searchSpan: 4,
// hide: true,
// editDisplay: false,
// addDisplay: false
@@ -121,7 +121,8 @@
label: "接收指令人",
prop: "receiveName",
search: true,
- searchLabelWidth: 120,
+ searchLabelWidth: 90,
+ searchSpan: 4,
},
{
label: "发送指令时间",
diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index e9d9690..db4b3d0 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -96,6 +96,7 @@
label: "通知标题",
prop: "title",
span: 24,
+ searchSpan: 4,
row: true,
search: true,
rules: [
diff --git a/src/views/permit/permit.vue b/src/views/permit/permit.vue
index 8723927..7cf7002 100644
--- a/src/views/permit/permit.vue
+++ b/src/views/permit/permit.vue
@@ -179,6 +179,8 @@
label: "企业名称",
search: true,
prop: "enterprisename",
+ searchLabelWidth: 80,
+ searchSpan: 4,
overHidden: true,
width: 180,
rules: [
@@ -336,6 +338,7 @@
search: true,
prop: "ptype",
type: "select",
+ searchSpan: 4,
dicData: [
{
label: "保安服务许可",
diff --git a/src/views/qualificationExamination/registrationTrainingQuery.vue b/src/views/qualificationExamination/registrationTrainingQuery.vue
index 53c33c5..a83e357 100644
--- a/src/views/qualificationExamination/registrationTrainingQuery.vue
+++ b/src/views/qualificationExamination/registrationTrainingQuery.vue
@@ -122,6 +122,7 @@
label: "姓名",
prop: "name",
width: 100,
+ searchLabelWidth: 50,
rules: [
{
required: true,
@@ -130,7 +131,7 @@
},
],
search: true,
- searchSpan: 5,
+ searchSpan: 4,
},
{
label: "性别",
diff --git a/src/views/securityCompany/regulatoryInformation.vue b/src/views/securityCompany/regulatoryInformation.vue
index 9af5d16..60ac6eb 100644
--- a/src/views/securityCompany/regulatoryInformation.vue
+++ b/src/views/securityCompany/regulatoryInformation.vue
@@ -111,8 +111,8 @@
label: "保安公司",
prop: "deptid",
labelWidth: 120,
- searchLabelWidth: 120,
- searchSpan: 5,
+ searchLabelWidth: 75,
+ searchSpan: 4,
dicUrl:
"/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
@@ -134,14 +134,14 @@
label: "处罚类型",
prop: "punishtype",
type: "select",
- labelWidth: 120,
+ labelWidth: 85,
// display: false,
dicData: dic,
// props: {
// label: "label",
// value: "value",
// },
- searchSpan: 5,
+ searchSpan: 4,
search: true,
width: 120,
},
diff --git a/src/views/securityGuardManagement/dispatchChildoperable.vue b/src/views/securityGuardManagement/dispatchChildoperable.vue
index a15e134..98cb4e4 100644
--- a/src/views/securityGuardManagement/dispatchChildoperable.vue
+++ b/src/views/securityGuardManagement/dispatchChildoperable.vue
@@ -109,7 +109,7 @@
menu: false,
searchShowBtn: false,
selection: true,
- searchSize: "mini",
+ // searchSize: "mini",
searchMenuSpan: 8,
height: 600,
cellBtn: false,
@@ -133,8 +133,8 @@
label: "保安公司",
prop: "deptId",
labelWidth: 120,
- searchLabelWidth: 120,
- searchSpan: 5,
+ searchLabelWidth: 75,
+ searchSpan: 4,
dicUrl:
"/api/blade-system/dept/security_lazy-tree?parentId=1413470343230877697",
props: {
@@ -162,14 +162,14 @@
label: "派遣单位",
prop: "dispatcherUnitId",
labelWidth: 120,
- searchLabelWidth: 120,
+ searchLabelWidth: 75,
dicUrl: "/api/dispatcherUnit/page-tree",
props: {
label: "name",
value: "id",
},
hide: true,
- searchSpan: 5,
+ searchSpan: 4,
search: true,
overHidden: true,
type: "tree",
@@ -185,9 +185,9 @@
label: "保安人名称",
prop: "name",
search: true,
- searchSpan: 5,
+ searchSpan: 4,
labelWidth: 120,
- searchLabelWidth: 110,
+ searchLabelWidth: 90,
// overHidden: true
rules: [
{
diff --git a/vue.config.js b/vue.config.js
index a639cee..dc6a794 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -29,7 +29,8 @@
//本地服务接口地址
// target: 'http://192.168.0.109:1',
//远程演示服务地址,可用于直接启动项目
- target: 'http://2h3f861221.wicp.vip:58646',
+ // target: 'http://2h3f861221.wicp.vip:58646',
+ target: 'http://192.168.0.109:82',
ws: true,
pathRewrite: {
'^/api': '/'
--
Gitblit v1.9.3