From a105a3e6fc133cea11918e427b60bfb886b0d9ff Mon Sep 17 00:00:00 2001 From: "zhaokaiyao@91isoft.com" <6922339zky> Date: Mon, 11 Oct 2021 11:10:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B->?= =?UTF-8?q?=E6=A0=87=E5=87=86=E4=BD=93=E7=B3=BB=E5=BC=B9=E5=87=BA=E6=A1=86?= =?UTF-8?q?->=E6=97=A0=E6=B3=95=E5=8F=96=E6=B6=88=20=E5=90=8C=E4=B8=8A?= =?UTF-8?q?=E4=B8=80=E4=B8=AA=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step1.vue | 55 ++++++++++--------- 1 file changed, 30 insertions(+), 25 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index bfa71af94..175355b33 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -144,7 +144,7 @@ width = "800" :data="standSystemOptions" :defaultProps="defaultProps" :checkedKeys="defaultCheckedKeys" - :nodeKey="nodeKey" @popoverHide="popoverHide"> + :nodeKey="nodeKey" @popoverHide="popoverHide" @popoverHideCancel="popoverHideCancel"> 1) { // this.fileList = fileList.splice(0, 1) @@ -2222,48 +2223,48 @@ // this.fileList = [] if(this.fileType === 'fbgbjbd'){ this.FBGBJBDFileList=fileList; - this.form.fbgbjbd = response.data.id; - this.form.fbgbjbdName = response.data.name; + this.form.fbgbjbd += response.data.id+','; + this.form.fbgbjbdName += response.data.name+','; }else if(this.fileType === 'xgd'){ this.xgdFileList=fileList; - this.form.xgd = response.data.id; - this.form.xgdName = response.data.name; + this.form.xgd += response.data.id+','; + this.form.xgdName += response.data.name+','; }else if(this.fileType === 'bpg'){ this.bpgFileList=fileList; - this.form.bpg = response.data.id; - this.form.bpgName = response.data.name; + this.form.bpg += response.data.id+','; + this.form.bpgName += response.data.name+','; }else if(this.fileType === 'ssg'){ this.ssgFileList=fileList; - this.form.ssg = response.data.id; - this.form.ssgName = response.data.name; + this.form.ssg += response.data.id+','; + this.form.ssgName += response.data.name+','; }else if(this.fileType === 'zqyjg'){ this.zqyjgFileList=fileList; - this.form.zqyjg = response.data.id; - this.form.zqyjgName = response.data.name; + this.form.zqyjg += response.data.id+','; + this.form.zqyjgName += response.data.name+','; }else if(this.fileType === 'jdwj'){ this.jdwjFileList=fileList; - this.form.jdwj = response.data.id; - this.form.jdwjName = response.data.name; + this.form.jdwj += response.data.id+','; + this.form.jdwjName += response.data.name+','; }else if(this.fileType === 'kwj'){ this.kwjFileList=fileList; - this.form.kwj = response.data.id; - this.form.kwjName = response.data.name; + this.form.kwj += response.data.id+','; + this.form.kwjName += response.data.name+','; }else if(this.fileType === 'xgd'){ this.xgdFileList=fileList; - this.form.xgd = response.data.id; - this.form.xgdName = response.data.name; + this.form.xgd += response.data.id+','; + this.form.xgdName += response.data.name+','; }else if(this.fileType === 'glwj'){ this.qlwjFileList=fileList; - this.form.glwj = response.data.id; - this.form.glwjName = response.data.name; + this.form.glwj += response.data.id+','; + this.form.glwjName += response.data.name+','; }else if(this.fileType === 'ca'){ this.caFileList=fileList; - this.form.ca = response.data.id; - this.form.caName = response.data.name; + this.form.ca += response.data.id+','; + this.form.caName += response.data.name+','; }else if(this.fileType === 'zbjbd'){ this.zbjbdFileList=fileList; - this.form.zbjbd = response.data.id; - this.form.zbjbdName = response.data.name; + this.form.zbjbd += response.data.id+','; + this.form.zbjbdName += response.data.name+','; } this.$message({ showClose: true, @@ -2304,13 +2305,17 @@ }, popoverHide (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData) { - if(checkedData.length > 0){ + if(checkedData.length > 0 && checkedData.length != 0){ this.form.standSystem = checkedData.map(item => item.menuName).join(",") }else { this.form.standSystem = checkedData.menuName } + this.modalShowFlag1 = false } - this.modalShowFlag1 = false + + }, + popoverHideCancel(){ + this.modalShowFlag1 = false }, popoverHideBusVs (checkedIds, checkedData,isShow,isLoadChild,topId) { if(checkedData && checkedData.length != 0) { From 718a2b923b50e18e608fa93dc4712a9d9ab49514 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 11 Oct 2021 16:10:00 +0800 Subject: [PATCH 2/4] commit --- src/assets/styles/newStyle.less | 345 +----------------- src/components/navMenu/index.vue | 5 +- src/pages/home/components/EnterCard.vue | 46 ++- .../home2/components/empennage/index.vue | 20 +- src/pages/home2/components/navMenu/index.vue | 30 +- src/pages/home2/components/release/index.vue | 3 +- .../components/solicitopinions/index.vue | 3 +- src/pages/home2/components/todoList/index.vue | 36 +- src/pages/home2/index.vue | 4 +- .../processCenter/pages/newProcess/index.vue | 6 +- .../page/listOther.vue | 6 +- 11 files changed, 103 insertions(+), 401 deletions(-) diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less index 1851c1e7f..d2d4354f1 100644 --- a/src/assets/styles/newStyle.less +++ b/src/assets/styles/newStyle.less @@ -1,347 +1,3 @@ -//button.el-button.form-upload-btn.el-button--default.el-button--small{ -// padding: 13px 15px; -//} -////设置查询按钮 -//.el-button--primary.searchAngNewBtn{ -// height: 32px; -// padding: 0 15px; -// color: #fff; -// background-color: #3391CE; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', Arial, sans-serif; -// border-color: #3391CE; -// &.is-disabled { -// background-color: #b0d3ed !important; -// border-color: #bcd1e0 !important; -// } -//} -//.el-button--primary.searchAngNewBtn:hover{ -// padding: 0 15px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button--primary.searchAngNewBtn:focus{ -// padding: 0 15px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button--danger.searchAngNewBtn{ -// height: 32px; -// padding: 0 15px; -// color: #fff; -//} -//.el-button--danger.searchAngNewBtn:hover{ -// padding: 0 15px; -//} -//.el-button--danger.searchAngNewBtn:focus{ -// padding: 0 15px; -//} -//.el-button.searchAngNewBtn{ -// height: 32px; -// padding: 0 15px; -// //color: #fff; -//} -//.el-button.searchAngNewBtn:hover{ -// padding: 0 15px; -//} -//.el-button.searchAngNewBtn:focus{ -// padding: 0 15px; -//} -////设置新增，导出等按钮 -//.el-button.el-button--primary.el-button--mini { -// padding: 5px 18px; -// color: #fff; -// background-color: #3391CE; -// border-color: #3391CE; -// &.is-disabled { -// background-color: #b0d3ed !important; -// border-color: #bcd1e0 !important; -// } -//} -//.el-button.el-button--primary.el-button--mini:hover{ -// padding: 5px 18px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button.el-button--primary.el-button--mini:focus{ -// padding: 5px 18px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button.el-button--danger.el-button--mini { -// padding: 5px 18px; -// color: #fff; -//} -//.el-button.el-button--danger.el-button--mini:hover{ -// padding: 5px 18px; -//} -//.el-button.el-button--danger.el-button--mini:focus{ -// padding: 5px 18px; -//} -//// 设置表格操作按钮 -//.el-button.el-button--primary.el-button--mini.opera-btn { -// padding: 5px 7px; -// color: #fff; -// background-color: #3391CE; -// border-color: #3391CE; -// &.is-disabled { -// background-color: #b0d3ed !important; -// border-color: #bcd1e0 !important; -// } -//} -//.el-button.el-button--primary.el-button--mini.opera-btn:hover{ -// padding: 5px 7px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button.el-button--primary.el-button--mini.opera-btn:focus{ -// padding: 5px 7px; -// background-color: #3391CE; -// border-color: #3391CE; -//} -//.el-button.el-button--danger.el-button--mini.opera-btn { -// padding: 5px 7px; -// color: #fff; -//} -//.el-button.el-button--danger.el-button--mini.opera-btn:hover{ -// padding: 5px 7px; -//} -//.el-button.el-button--danger.el-button--mini.opera-btn:focus{ -// padding: 5px 7px; -//} -//.el-button.el-button--warning.el-button--mini.opera-btn { -// padding: 5px 7px; -// color: #fff; -// background-color: #ff9900; -// border-color: #ff9900; -//} -//.el-button.el-button--warning.el-button--mini.opera-btn:hover{ -// padding: 5px 7px; -// background-color: #ff9900; -// border-color: #ff9900; -//} -//.el-button.el-button--warning.el-button--mini.opera-btn:focus{ -// padding: 5px 7px; -// background-color: #ff9900; -// border-color: #ff9900; -//} -// -////设置form-item -//.el-form-item.serch-form-item { -// margin-bottom: 0; -// margin-right: 6px; -// margin-top: 10px; -//} -//.el-form-item.serch-form-item.btn-box { -// margin-bottom: 0; -// margin-right: 2px; -//} -//// 设置查询orm-item-lable -//.serch-form-item .el-form-item__label{ -// position: relative; -// top: 1px; -// padding: 0 7px; -// height: 32px; -// line-height: 32px; -// font-size: 12px; -// border: 1px solid #DDD; -// border-top-left-radius: 4px; -// border-bottom-left-radius: 4px; -// border-right: none; -// background: #F4F8FB; -// text-align: center; -// min-width: 80px; -//} -//.serch-form-item .el-form-item__content { -// line-height: 32px; -// position: relative; -// font-size: 14px; -// .put__inner{ -// height: 32px !important; -// line-height: 32px !important; -// width: 170px; -// 0 4px 4px 0; -// font-size: 12px; -// color: #515a6e; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; -// } -// .el-input__icon{ -// line-height: 32px; -// } -//} -//.el-form-item.search-form-item.btn-box { -// margin-bottom: 0; -// margin-right: 2px; -//} -//// 设置查询orm-item-lable -//.search-form-item .el-form-item__label{ -// position: relative; -// top: 1px; -// padding: 0 7px; -// height: 32px; -// line-height: 32px; -// font-size: 12px; -// border: 1px solid #DDD; -// border-top-left-radius: 4px; -// border-bottom-left-radius: 4px; -// border-right: none; -// background: #F4F8FB; -// text-align: center; -// min-width: 80px; -//} -//.search-form-item .el-form-item__content { -// line-height: 32px; -// position: relative; -// font-size: 14px; -// .el-input__inner{ -// height: 32px !important; -// line-height: 32px !important; -// width: 180px; -// 4px; -// font-size: 12px; -// color: #515a6e; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; -// } -// .el-input__icon{ -// line-height: 32px; -// } -//} -//// 设置新增form-item-lable -//.add-form-item .el-form-item__label{ -// position: relative; -// top: 1px; -// padding: 0 7px; -// width: 120px; -// height: 40px; -// line-height: 40px; -// font-size: 12px; -// border: 1px solid #DDD; -// border-top-left-radius: 4px; -// border-bottom-left-radius: 4px; -// border-right: none; -// background: #F4F8FB; -// text-align: center; -// white-space: nowrap; -// text-overflow: ellipsis; -// overflow: hidden; -//} -//.add-form-item .el-form-item__content { -// position: relative; -// font-size: 14px; -// width: 224px; -// .el-input__inner{ -// 0 4px 4px 0; -// font-size: 12px; -// color: #515a6e; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; -// width: 224px; -// } -// //设置输入框高度 -//// .label-input-form{ -//// .el-input__inner{ -//// // @media all and (-ms-high-contrast: none), (-ms-high-contrast: active) { -//// // // ie下样式偏差1px -//// // line-height: 27px !important; -//// // } -//// } -//// } -//} -//// 设置新增等按钮区域样式 -//.action-bar{ -// padding:10px 0; -// .el-button+.el-button{ -// margin-left: 2px; -// } -//} -//// 设置tabs激活状态颜色 -//.el-tabs--border-card>.el-tabs__header .el-tabs__item.is-active { -// color: #3391CE; -// background-color: #FFF; -// border-right-color: #DCDFE6; -// border-left-color: #DCDFE6; -//} -//// 设置tabs hover颜色 -//.el-tabs--border-card>.el-tabs__header .el-tabs__item:not(.is-disabled):hover { -// color: #3391CE; -//} -//// 设置页面查询区域下的下划线 -//.search-area { -// border-bottom: 1px solid #e8eaec; -//} -///* element样式重置 start */ -///* 去掉input尾部上下小箭头 start */ -//input::-webkit-outer-spin-button,input::-webkit-inner-spin-button{ -// -webkit-appearance: none !important; -// -moz-appearance: none !important; -// -o-appearance: none !important; -// -ms-appearance: none !important; -// appearance: none !important; -// margin: 0; -//} -//input[type="number"]{ -// -webkit-appearance:textfield; -// -moz-appearance:textfield; -// -o-appearance:textfield; -// -ms-appearance:textfield; -// appearance:textfield; -//} -///* 去掉input尾部上下小箭头 end */ -//// 所属部门选项 样式 -//.user-dept-popper{ -// padding: 0; -//} -//// 表单验证星星样式 -//.single-star { -// .el-form-item__label:before{ -// content: '*' !important; -// color: #F56C6C !important; -// margin-right: 4px !important; -// } -//} -//.double-star { -// .el-form-item__label:before{ -// content: '**' !important; -// color: #F56C6C !important; -// margin-right: 4px !important; -// } -//} -//.add-form-item{ -// /*margin-top -1px*/ -// .top1px{ -// .el-input__inner{ -// margin-top: -1px; -// } -// } -// .el-textarea{ -// .el-textarea__inner{ -// height: 40px; -// min-height: 40px !important; -// font-size: 12px; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; -// border-bottom-left-radius: 0; -// border-top-left-radius: 0; -// } -// } -// .form-upload-btn{ -// font-size: 12px; -// font-family: Helvetica, 'Hiragino Sans GB', 'Microsoft Yahei', '\5FAE\8F6F\96C5\9ED1', Arial, sans-serif !important; -// } -//} -//// 设置日期样式 -//.el-date-editor .el-range-input{ -// font-size: 12px; -// font-family: sans-serif; -//} -//span.el-range-separator{ -// position: relative; -// left: -6px; -// font-size: 12px; -//} -//.el-date-editor .el-range-separator{ -// line-height: 26px; -//} -//.serch-form-item .el-form-item__content .el-input__icon{ -// line-height: 26px; -//} // 设置查询区域 .search-area{ display: flex; @@ -516,6 +172,7 @@ button.el-button.common-button-default.el-button--default.is-round{ } // 按钮 + 图标 .add-button{ + height: 32px; .add{ background-image: url("~assets/images/shangqi/img/add.png"); } diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index 2fdf6eed3..2e58d256d 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -8,7 +8,8 @@ -
{{ this.isCollapse ? '' : '' }}
+
+
{{ this.isCollapse ? '' : '' }}
-
+
-
- -
{{ label }}
@@ -30,16 +27,49 @@ diff --git a/src/pages/home2/components/empennage/index.vue b/src/pages/home2/components/empennage/index.vue index ac92d4df1..892deb0ca 100644 --- a/src/pages/home2/components/empennage/index.vue +++ b/src/pages/home2/components/empennage/index.vue @@ -3,12 +3,12 @@
友情链接
    -
  • +
    • -
  • - 更多链接> +
  • + 更多链接 ⋙
@@ -61,6 +61,7 @@ export default { border-radius: 3px; height: 100%; .title { + font-weight: bold; padding-left: 10px; width: 80px; } @@ -70,20 +71,25 @@ export default { height: 100%; text-align: center; user-select: none; - li { - border-right: 1px solid #f4f4f4; + .myLi1 { + border-right: 2px solid #f4f4f4; flex: 1; a { color: #333333; } } - li:hover { + .myLi1:hover { background: #5ea9f6; a { - color: #e9ca32; + color: #fff; text-decoration: none; } } + .myLi2 { + padding: 0 10px; + cursor: pointer; + color: #5ea9f6 !important; + } } } diff --git a/src/pages/home2/components/navMenu/index.vue b/src/pages/home2/components/navMenu/index.vue index 11a2617e7..0c8f065ad 100644 --- a/src/pages/home2/components/navMenu/index.vue +++ b/src/pages/home2/components/navMenu/index.vue @@ -2,13 +2,13 @@