From e846eefa54a7a2274a34d43d4601e192a1ada3d9 Mon Sep 17 00:00:00 2001
From: loulijun2021 <1694218219@qq.com>
Date: 星期六, 25 六月 2022 13:16:07 +0800
Subject: [PATCH] 1.项目整体样式的配置2.实现工艺设置动态添加的静态样式
---
src/views/jcsz/zzjg.vue | 22 ++
src/permission.js | 7
src/views/jcsz/wldw.vue | 31 +++
src/views/zzmx/gylx.vue | 183 ++++++++++++++++----
src/views/login/index.vue | 15 +
src/views/sbgl/sbqd.vue | 45 +++-
src/layout/components/Navbar.vue | 2
src/views/template.vue | 31 +++
src/components/Pagination/index.vue | 30 +++
src/views/jcsz/yhqd.vue | 123 +++++++++----
src/views/jcsz/jsqd.vue | 32 +++
src/views/wlgl/ckdy.vue | 13 +
src/layout/components/Sidebar/index.vue | 4
13 files changed, 433 insertions(+), 105 deletions(-)
diff --git a/src/components/Pagination/index.vue b/src/components/Pagination/index.vue
index 6d7184d..51bcb07 100644
--- a/src/components/Pagination/index.vue
+++ b/src/components/Pagination/index.vue
@@ -8,6 +8,7 @@
:page-sizes="pageSizes"
:total="total"
v-bind="$attrs"
+ popper-class="select_bottom"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
/>
@@ -98,4 +99,33 @@
.pagination-container.hidden {
display: none;
}
+
+::v-deep .el-pagination__sizes .el-input .el-input__inner:hover{
+ border-color: #42b983 ;
+}
+::v-deep .el-pagination__sizes .el-input .el-input__inner:focus{
+ border-color: #42b983;
+}
+
+</style>
+<style lang="scss">
+.select_bottom{
+ //z-index: 2008; position: absolute; left: 147px !important; top: 355px !important; margin: 0px;
+ //border: 1px solid #55aaff;
+ //.el-select-dropdown {
+ //
+ //}
+ //.el-select-dropdown {
+ // background-color: #ffffff;
+ //}
+ .el-select-dropdown__item.selected {
+ color: #42b983;
+ }
+
+ //.el-select-dropdown__item.hover,
+ //.el-select-dropdown__item:hover {
+ // background: red;
+ // color: #fff;
+ //}
+}
</style>
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 1ec4978..4b04a7c 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -92,7 +92,7 @@
removeCookie('usertype')
removeCookie('userid')
this.$message.success('閫�鍑烘垚鍔燂紒')
- this.$router.push(`/login?redirect=${this.$route.fullPath}`)
+ this.$router.push('/login')
// this.$router.push(`/login?redirect=${this.$route.fullPath}`)
}
// this.$router.push(`/login`)
diff --git a/src/layout/components/Sidebar/index.vue b/src/layout/components/Sidebar/index.vue
index aaf7bb1..33acb9b 100644
--- a/src/layout/components/Sidebar/index.vue
+++ b/src/layout/components/Sidebar/index.vue
@@ -58,6 +58,7 @@
'sidebar'
]),
routes() {
+ // 鎺ュ彛涓殑杩斿洖鍊� 杩涜鏍煎紡鍖�
const newCodeArr = []
const newCodeNameArr = []
this.routers.forEach(item => {
@@ -74,6 +75,8 @@
}
}
})
+
+ // 鏈湴璺敱涓� 鎺ュ彛涓殑杩斿洖鍊艰繘琛屽尮閰嶏紝鏈夌浉鍚宑ode鐨勫�艰繘琛宲ush
const arr = this.$router.options.routes
const arr2 = []
arr.forEach((item, index) => {
@@ -100,6 +103,7 @@
arr2.push(item)
}
})
+
return arr2
// return arr
},
diff --git a/src/permission.js b/src/permission.js
index ac6b2fe..1c2f525 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -52,7 +52,12 @@
// if (s) {
// console.log(s)
// }
-
+ // const s = store.getters.addRouters
+ // router.addRoutes(s)
+ //
+ // if (s) {
+ // console.log(s, 11111)
+ // }
next()
// next({ ...to, replace: true })
} catch (error) {
diff --git a/src/views/jcsz/jsqd.vue b/src/views/jcsz/jsqd.vue
index 4eaae5f..badb582 100644
--- a/src/views/jcsz/jsqd.vue
+++ b/src/views/jcsz/jsqd.vue
@@ -17,7 +17,7 @@
<el-input v-model="form.RoleName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="瑙掕壊绫诲瀷" style=" display: flex;">
- <el-select v-model="form.RoleTypeCode" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.RoleTypeCode" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in RoleTypeCodeArr2"
:key="item.roletype_code"
@@ -162,6 +162,7 @@
<el-select
v-model="dialogForm.RoleTypeCode"
filterable
+ :popper-append-to-body="false"
style="width: 220px"
placeholder="璇烽�夋嫨"
>
@@ -274,7 +275,7 @@
<el-dialog
title="瑙掕壊鍏宠仈鐢ㄦ埛"
:visible.sync="userDialogVisible"
- width="90%"
+ width="80%"
top="15vh"
class="userDialogVisible"
@closed="handleCloseUser"
@@ -300,6 +301,7 @@
ref="dialogCascaderUser"
key="cascaderKey"
filterable
+ :append-to-body="false"
:options="StuOrgArr"
:props="defaultProps"
class="userDialogVisibleInput"
@@ -312,6 +314,7 @@
<el-select
v-model="dialogFormUser.isrole"
filterable
+ :popper-append-to-body="false"
style="width: 220px"
placeholder="璇烽�夋嫨"
class="userDialogVisibleInput"
@@ -1278,8 +1281,12 @@
height: 30px;
display: flex;
align-items: center;
- border: 1px solid $main_color;
+ //border: 1px solid $main_color;
+ border: none;
padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+ border: none;
}
::v-deep .el-button--info{
@@ -1414,6 +1421,9 @@
height: 30px;
line-height: 30px;
}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
::v-deep .el-table .caret-wrapper {
//float: right;
@@ -1481,4 +1491,20 @@
.body ::v-deep .el-form-item{
margin-bottom: 0;
}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+ color: $main_color;
+}
+
+::v-deep .el-textarea__inner:focus{
+ border-color: $main_color;
+}
+
</style>
diff --git a/src/views/jcsz/wldw.vue b/src/views/jcsz/wldw.vue
index 6c03be4..269afb5 100644
--- a/src/views/jcsz/wldw.vue
+++ b/src/views/jcsz/wldw.vue
@@ -17,7 +17,7 @@
<el-input v-model="form.CuntUnitName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="鍗曚綅灞炴��" style=" display: flex;">
- <el-select v-model="form.UnitAttr" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.UnitAttr":popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in UnitAttrArr"
:key="item.value"
@@ -460,16 +460,22 @@
height: 30px;
display: flex;
align-items: center;
- border: 1px solid $main_color;
+ //border: 1px solid $main_color;
+ border: none;
padding: 0 20px;
}
-
+::v-deep .el-button--primary:hover {
+ border: none;
+}
::v-deep .el-button--info {
//background-color: $main_color !important;
height: 30px;
display: flex;
align-items: center;
padding: 0 20px;
+}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
}
::v-deep .el-pagination.is-background .el-pager li:not(.disabled).active {
@@ -590,4 +596,23 @@
.body ::v-deep .el-form-item{
margin-bottom: 0;
}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+ color: $main_color;
+}
+::v-deep .el-checkbox__inner:hover{
+ border-color: $main_color;
+}
+::v-deep .el-textarea__inner:focus{
+ border-color: $main_color;
+}
+
</style>
diff --git a/src/views/jcsz/yhqd.vue b/src/views/jcsz/yhqd.vue
index c5ad802..4af174c 100644
--- a/src/views/jcsz/yhqd.vue
+++ b/src/views/jcsz/yhqd.vue
@@ -20,14 +20,16 @@
<el-cascader
ref="cascader"
filterable
+ popper-class="elCascader"
:options="StuOrgArr"
:props="defaultProps"
@change="cascaderChange"
/>
</el-form-item>
<el-form-item label="宸ヨ祫绫诲瀷" style=" display: flex;">
- <el-select v-model="form.wagetype" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.wagetype" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
+
v-for="item in wagetypeArr"
:key="item.value"
:label="item.label"
@@ -36,7 +38,7 @@
</el-select>
</el-form-item>
<el-form-item label="鍦ㄨ亴鐘舵��" style=" display: flex;">
- <el-select v-model="form.Enable" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.Enable" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in EnableArr"
:key="item.value"
@@ -196,6 +198,7 @@
<el-form-item label="鍦ㄨ亴鐘舵��" prop="Enable">
<el-select
v-model="dialogForm.Enable"
+ :popper-append-to-body="false"
filterable
style="width: 220px"
placeholder="璇烽�夋嫨"
@@ -208,34 +211,35 @@
/>
</el-select>
</el-form-item>
- <div style="display: flex">
- <el-form-item label="鎵�灞炵粍缁�" prop="StuOrg" style="display: flex">
- <el-cascader
- ref="dialogCascader"
- key="cascaderKey"
- filterable
- :options="StuOrgArr"
- :props="defaultProps"
- style="width: 220px;"
- @change="dialogCascaderChange"
+ <el-form-item label="鎵�灞炵粍缁�" prop="StuOrg" style="display: flex;float: left">
+ <el-cascader
+ ref="dialogCascader"
+ key="cascaderKey"
+ filterable
+ popper-class="elCascader"
+ :options="StuOrgArr"
+ :props="defaultProps"
+ style="width: 220px;"
+ @change="dialogCascaderChange"
+ />
+ </el-form-item>
+ <el-form-item label="宸ヨ祫绫诲瀷" prop="wagetype">
+ <el-select
+ v-model="dialogForm.wagetype"
+ :popper-append-to-body="false"
+ filterable
+ style="width: 220px"
+ placeholder="璇烽�夋嫨"
+ >
+ <el-option
+ v-for="item in wagetypeArr"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value"
/>
- </el-form-item>
- <el-form-item label="宸ヨ祫绫诲瀷" prop="wagetype">
- <el-select
- v-model="dialogForm.wagetype"
- filterable
- style="width: 220px"
- placeholder="璇烽�夋嫨"
- >
- <el-option
- v-for="item in wagetypeArr"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- />
- </el-select>
- </el-form-item>
- </div>
+ </el-select>
+ </el-form-item>
+
<el-form-item label="鑱旂郴鏂瑰紡">
<el-input v-model="dialogForm.Mobile" style="width: 220px" />
</el-form-item>
@@ -390,8 +394,8 @@
wagetype: ''
},
wagetypeArr: [
- { value: '1', label: '璁′欢鍒�' },
- { value: '2', label: '璁℃椂鍒�' }
+ { value: '2', label: '璁′欢鍒�' },
+ { value: '1', label: '璁℃椂鍒�' }
],
operation: '',
dialogFormRules: {
@@ -878,11 +882,15 @@
height: 30px;
display: flex;
align-items: center;
- border: 1px solid $main_color;
+ //border: 1px solid $main_color;
+ border: none;
padding: 0 20px;
}
+::v-deep .el-button--primary:hover {
+ border: none;
+}
-::v-deep .el-button--info{
+::v-deep .el-button--info {
//background-color: $main_color !important;
height: 30px;
display: flex;
@@ -936,7 +944,7 @@
::v-deep .el-input__inner {
height: 30px;
- line-height:30px;
+ line-height: 30px;
}
::v-deep .el-table .caret-wrapper {
@@ -1051,12 +1059,55 @@
}
}
-.body ::v-deep .el-divider{
+.body ::v-deep .el-divider {
border: 1px solid #eee;
width: 99%;
margin: 10px auto;
}
-.body ::v-deep .el-form-item{
+
+.body ::v-deep .el-form-item {
margin-bottom: 0;
}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+ color: $main_color;
+}
+
+::v-deep .el-input__inner:focus {
+ border-color: #42b983 !important;
+}
+
+//::v-deep .el-cascader:not(.is-disabled):hover .el-input__inner:focus {
+// border-color: #42b983 !important;
+//}
+</style>
+<style lang="scss">
+.elCascader {
+ //.el-cascader-node.in-active-path, .el-cascader-node.is-active, .el-cascader-node.is-selectable.in-checked-path {
+ // color: #42b983 ;
+ //}
+ .el-cascader-node.is-selectable.in-checked-path {
+ color: #42b983;
+ }
+
+ .el-radio__input.is-checked .el-radio__inner {
+ background-color: #42b983;
+ border-color: #42b983;
+ }
+ .el-radio__input.is-checked .el-radio__inner:hover {
+ border-color: #42b983;
+ }
+ .el-input__inner{
+ border-color: #42b983 !important;
+ }
+
+}
</style>
diff --git a/src/views/jcsz/zzjg.vue b/src/views/jcsz/zzjg.vue
index 45dde40..235f4ac 100644
--- a/src/views/jcsz/zzjg.vue
+++ b/src/views/jcsz/zzjg.vue
@@ -17,7 +17,7 @@
<el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="缁勭粐绫诲瀷" style=" display: flex;">
- <el-select v-model="form.OrgType" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.OrgType" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in OrgTypeArr"
:key="item.value"
@@ -139,7 +139,6 @@
<el-form-item label="缁勭粐绫诲瀷" prop="OrgType">
<el-radio-group
v-model="dialogForm.OrgType"
-
@change="changeRadio"
>
<el-radio
@@ -161,6 +160,7 @@
v-model="dialogForm.SupUnit"
style="width: 220px"
filterable
+ :popper-append-to-body="false"
placeholder="璇烽�夋嫨"
>
<el-option
@@ -416,8 +416,12 @@
height: 30px;
display: flex;
align-items: center;
- border: 1px solid $main_color;
+ //border: 1px solid $main_color;
+ border: none;
padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+ border: none;
}
::v-deep .el-button--info{
@@ -507,4 +511,16 @@
.body ::v-deep .el-form-item{
margin-bottom: 0;
}
+
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+color: $main_color;
+}
</style>
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index d6e99ab..c0212f9 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -131,15 +131,20 @@
// } else {
// callback()
// }
- const mPattern = /^\w+$/ // 姝ｅ垯 绛変环浜嶽A-Za-z0-9_]
+ // const mPattern = /^\w+$/ // 姝ｅ垯 绛変环浜嶽A-Za-z0-9_]
if (value.length < 1) {
callback(new Error('璐﹀彿涓嶈兘涓虹┖锛�'))
- } else if (!mPattern.test(value)) {
- callback(new Error('璐﹀彿涓嶇鍚堣鍒欙紝鍙緭鍏ュ瓧姣嶃�佹暟瀛楀強涓嬪垝绾�'))
} else {
callback()
}
+ // if (value.length < 1) {
+ // callback(new Error('璐﹀彿涓嶈兘涓虹┖锛�'))
+ // } else if (!mPattern.test(value)) {
+ // callback(new Error('璐﹀彿涓嶇鍚堣鍒欙紝鍙緭鍏ュ瓧姣嶃�佹暟瀛楀強涓嬪垝绾�'))
+ // } else {
+ // callback()
+ // }
}
const validatePassword = (rule, value, callback) => {
if (value.length < 1) {
@@ -150,8 +155,8 @@
}
return {
loginForm: {
- username: 'Admin',
- password: '123456'
+ username: '寮犱笁', // Admin
+ password: '123456'// 123456
},
loginRules: {
username: [{ required: true, trigger: ['blur', 'change'], validator: validateUsername }],
diff --git a/src/views/sbgl/sbqd.vue b/src/views/sbgl/sbqd.vue
index 346addf..ad2373f 100644
--- a/src/views/sbgl/sbqd.vue
+++ b/src/views/sbgl/sbqd.vue
@@ -17,7 +17,7 @@
<el-input v-model="form.DeviceName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="浣跨敤鐘舵��" style=" display: flex;">
- <el-select v-model="form.Status" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.Status" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -27,7 +27,7 @@
</el-select>
</el-form-item>
<el-form-item label="鎵�灞炶溅闂�" style=" display: flex;">
- <el-select v-model="form.WorkShop" filterable style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.WorkShop" :popper-append-to-body="false" filterable style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -37,7 +37,7 @@
</el-select>
</el-form-item>
<el-form-item filterable label="璁惧绫诲瀷" style="display: flex;">
- <el-select v-model="form.DeviceType" style="width: 200px" placeholder="璇烽�夋嫨" @change="deviceTypeChange">
+ <el-select v-model="form.DeviceType" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨" @change="deviceTypeChange">
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -49,6 +49,7 @@
<el-form-item label="璁惧缁�" style=" display: flex;">
<el-select
v-model="form.DeviceGroup"
+ :popper-append-to-body="false"
:disabled="form.DeviceType===''"
style="width: 200px"
placeholder="璇烽�夋嫨"
@@ -211,7 +212,7 @@
<el-input v-model="dialogForm.devicename" style="width: 220px" />
</el-form-item>
<el-form-item label="璁惧绫诲瀷" prop="devicetypecode">
- <el-select v-model="dialogForm.devicetypecode" style="width: 220px" placeholder="璇烽�夋嫨" @change="devicetypecodeChange">
+ <el-select v-model="dialogForm.devicetypecode" :popper-append-to-body="false" style="width: 220px" placeholder="璇烽�夋嫨" @change="devicetypecodeChange">
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -221,7 +222,7 @@
</el-select>
</el-form-item>
<el-form-item label="璁惧缁�" prop="devicegroupcode">
- <el-select v-model="dialogForm.devicegroupcode" :disabled="dialogForm.devicetypecode===''" style="width: 220px" placeholder="璇烽�夋嫨">
+ <el-select v-model="dialogForm.devicegroupcode" :popper-append-to-body="false" :disabled="dialogForm.devicetypecode===''" style="width: 220px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in DeviceGroupArr"
:key="item.code"
@@ -236,10 +237,11 @@
style="width: 220px"
type="date"
placeholder="閫夋嫨鏃ユ湡"
+ popper-class="dateStyle"
/>
</el-form-item>
<el-form-item label="鎵�灞炶溅闂�" prop="workshopcode">
- <el-select v-model="dialogForm.workshopcode" style="width: 220px" placeholder="璇烽�夋嫨" @change="workshopcodeChange">
+ <el-select v-model="dialogForm.workshopcode" :popper-append-to-body="false" style="width: 220px" placeholder="璇烽�夋嫨" @change="workshopcodeChange">
<el-option
v-for="item in WorkShopArr"
:key="item.code"
@@ -249,7 +251,7 @@
</el-select>
</el-form-item>
<el-form-item label="鎵�灞炰骇绾�" prop="linecode">
- <el-select v-model="dialogForm.linecode" :disabled="dialogForm.workshopcode===''" style="width: 220px" placeholder="璇烽�夋嫨">
+ <el-select v-model="dialogForm.linecode" :popper-append-to-body="false" :disabled="dialogForm.workshopcode===''" style="width: 220px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in WorkLineArr"
:key="item.linecode"
@@ -259,7 +261,7 @@
</el-select>
</el-form-item>
<el-form-item label="浣跨敤鐘舵��" prop="status">
- <el-select v-model="dialogForm.status" style="width: 220px" placeholder="璇烽�夋嫨">
+ <el-select v-model="dialogForm.status" :popper-append-to-body="false" style="width: 220px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in StatusArr"
:key="item.value"
@@ -419,7 +421,7 @@
sortable="custom"
>
<template slot-scope="{row}">
- <el-select v-if="row.isVisible===1" v-model="row.eqptype_code" placeholder="璇烽�夋嫨">
+ <el-select v-if="row.isVisible===1" v-model="row.eqptype_code" :popper-append-to-body="false" placeholder="璇烽�夋嫨">
<el-option
v-for="item in DeviceTypeArr"
:key="item.code"
@@ -972,10 +974,13 @@
height: 30px;
display: flex;
align-items: center;
- border: 1px solid $main_color;
+ //border: 1px solid $main_color;
+ border: none;
padding: 0 20px;
}
-
+::v-deep .el-button--primary:hover {
+ border: none;
+}
::v-deep .el-button--info {
//background-color: $main_color !important;
height: 30px;
@@ -1112,4 +1117,22 @@
.body ::v-deep .el-form-item{
margin-bottom: 0;
}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+ color: $main_color;
+}
+</style>
+<style lang="scss">
+.dateStyle{
+ .el-date-table td.today span{
+ color: #42b983;
+ }
+}
</style>
diff --git a/src/views/template.vue b/src/views/template.vue
index b548874..eb5b393 100644
--- a/src/views/template.vue
+++ b/src/views/template.vue
@@ -17,7 +17,7 @@
<el-input v-model="form.OrgName" placeholder="璇疯緭鍏�" style="width: 200px" />
</el-form-item>
<el-form-item label="缁勭粐绫诲瀷" style=" display: flex;">
- <el-select v-model="form.OrgType" style="width: 200px" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.OrgType" :popper-append-to-body="false" style="width: 200px" placeholder="璇烽�夋嫨">
<el-option
v-for="item in OrgTypeArr"
:key="item.value"
@@ -146,6 +146,7 @@
v-model="dialogForm.SupUnit"
style="width: 220px"
placeholder="璇烽�夋嫨"
+ :popper-append-to-body="false"
>
<el-option
v-for="item in SupUnitArr"
@@ -372,10 +373,13 @@
height: 30px;
display: flex;
align-items: center;
- border: 1px solid $main_color;
+ //border: 1px solid $main_color;
+ border: none;
padding: 0 20px;
}
-
+::v-deep .el-button--primary:hover {
+ border: none;
+}
::v-deep .el-button--info {
height: 30px;
display: flex;
@@ -430,6 +434,9 @@
::v-deep .el-input__inner {
height: 30px;
line-height: 30px;
+}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
}
::v-deep .el-table .caret-wrapper {
@@ -500,4 +507,22 @@
margin-bottom: 0;
}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus{
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected{
+ color: $main_color;
+}
+::v-deep .el-checkbox__inner:hover{
+ border-color: $main_color;
+}
+::v-deep .el-textarea__inner:focus{
+ border-color: $main_color;
+}
+
</style>
diff --git a/src/views/wlgl/ckdy.vue b/src/views/wlgl/ckdy.vue
index 3dc71ce..175cf65 100644
--- a/src/views/wlgl/ckdy.vue
+++ b/src/views/wlgl/ckdy.vue
@@ -333,8 +333,12 @@
height: 30px;
display: flex;
align-items: center;
- border: 1px solid $main_color;
+ //border: 1px solid $main_color;
+ border: none;
padding: 0 20px;
+}
+::v-deep .el-button--primary:hover {
+ border: none;
}
::v-deep .el-button--info {
@@ -461,4 +465,11 @@
margin-bottom: 0;
}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+::v-deep .el-textarea__inner:focus{
+ border-color: $main_color;
+}
+
</style>
diff --git a/src/views/zzmx/gylx.vue b/src/views/zzmx/gylx.vue
index db93532..906dacb 100644
--- a/src/views/zzmx/gylx.vue
+++ b/src/views/zzmx/gylx.vue
@@ -136,11 +136,12 @@
<el-form-item prop="SupUnit" label="浣跨敤鐘舵��" style="margin-right: 20px">
<el-select
v-model="dialogForm.isEnable"
+ :popper-append-to-body="false"
style="width: 220px"
placeholder="璇烽�夋嫨"
>
<el-option
- v-for="item in SupUnitArr"
+ v-for="item in isEnableArr"
:key="item.value"
:label="item.label"
:value="item.value"
@@ -152,43 +153,51 @@
</el-form-item>
</div>
<el-form-item label="宸ヨ壓璁剧疆" prop="OrgName">
- <div style="display: flex;width:100%;overflow-y: scroll">
+ <div class="settingDiv">
<!-- 瀹炵幇宸ヨ壓璁剧疆鍔ㄦ�佹坊鍔�-->
- <div v-for="(tag,index) in dynamicTags" :key="tag.id" style="display: flex;">
- <el-tag
- v-if="flag||tag.label!==flagSelected"
- closable
- :disable-transitions="false"
- style="margin-left: 0;width: 100px;"
- :class="tagClass(tag.label)"
- :effect="tag.effect"
- @close="handleTagClose(tag.label)"
- @click="elTagClick(tag)"
- >
- {{ tag.label }}
- <i class="el-icon-edit" @click="tagEdit(tag)" />
- </el-tag>
+ <div v-for="(tag,index) in dynamicTags" :key="tag.id" style="display: flex;align-items: center">
+ <div style="display: flex;align-items: center;position: relative">
- <el-autocomplete
- v-if="!flag&&tag.label===flagSelected"
- :ref="'saveTagInput'+tag.id"
- v-model="value"
- class="input-new-tag"
- size="small"
- :fetch-suggestions="querySearch"
- style="margin-left: 0px;width: 100px;transform: translate(1)"
- autofocus
- @select="handleSelect"
- @keyup.enter.native="handleInputConfirm2"
- />
- <!-- @blur="handleBlur2"-->
-
- <div v-if="index!==dynamicTags.length-1" style="width: 40px;">----></div>
+ <el-tooltip class="item" effect="dark" :content="tag.label" placement="top">
+ <el-tag
+ v-if="flag||tag.label!==flagSelected"
+ :closable="index!==0"
+ :disable-transitions="false"
+ class="elTag"
+ :class="tagClass(tag.label)"
+ :effect="tag.effect"
+ @close="handleTagClose(tag.label)"
+ @click="elTagClick(tag)"
+ >
+ <!-- <div class="orderNumber">{{ index }}</div>-->
+ {{ tag.label }}
+ <i class="el-icon-edit" @click="tagEdit(tag)" />
+ </el-tag>
+ </el-tooltip>
+ <el-autocomplete
+ v-if="!flag&&tag.label===flagSelected"
+ :ref="'saveTagInput'+tag.id"
+ v-model="value"
+ class="input-new-tag"
+ size="small"
+ :fetch-suggestions="querySearch"
+ style="margin-left: 0;width: 200px;transform: translate(1)"
+ autofocus
+ @select="handleSelect"
+ @keyup.enter.native="handleInputConfirm2"
+ />
+ <!-- @blur="handleBlur2"-->
+ <div v-if="index!==dynamicTags.length-1" style="width: 40px;height: 1px;border: 1px solid #42b983" />
+ </div>
</div>
<!-- :disabled="addDisabled"-->
- <el-button type="primary" style="margin-left: 20px;width: 100px;height: 32px;" size="small" @click="showInput">+
- 娣诲姞
- </el-button>
+ <el-button
+ type="success"
+ class="tagSuccess"
+ size="small"
+ icon="el-icon-plus"
+ @click="showInput"
+ />
</div>
</el-form-item>
@@ -247,7 +256,7 @@
page: 1, // 绗嚑椤�
rows: 10 // 姣忛〉澶氬皯鏉�
},
- isEnable: [
+ isEnableArr: [
{ label: '鏄�', value: 'Y' },
{ label: '鍚�', value: 'N' }
],
@@ -340,8 +349,10 @@
this.flag = !this.flag
},
tagEdit(tag) {
+ console.log(tag, 2)
+
this.addDisabled = true
- this.flagSelect = tag.label
+ this.flagSelected = tag.label
this.value = tag.label
this.flag = !this.flag
this.$nextTick(_ => {
@@ -349,7 +360,7 @@
})
},
elTagClick(tag) {
- console.log(tag)
+ console.log(tag, 1)
this.tagSelectedId = tag.id
if (tag.effect === 'dark') {
@@ -397,7 +408,7 @@
}
this.flag = !this.flag
this.$nextTick(_ => {
- this.$refs['saveTagInput' + this.dynamicTags.length ][0].focus()
+ this.$refs['saveTagInput' + this.dynamicTags.length][0].focus()
})
// this.$nextTick(_ => {
// console.log(this.$refs['saveTagInput'], 321)
@@ -585,6 +596,10 @@
line-height: 30px;
}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
::v-deep .el-table .caret-wrapper {
transform: scale(0.8);
}
@@ -653,4 +668,96 @@
margin-bottom: 0;
}
+::v-deep .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select .el-input__inner:focus {
+ border-color: $main_color;
+}
+
+::v-deep .el-select-dropdown__item.selected {
+ color: $main_color;
+}
+
+::v-deep .el-checkbox__inner:hover {
+ border-color: $main_color;
+}
+
+::v-deep .el-textarea__inner:focus {
+ border-color: $main_color;
+}
+
+/*
+瀹炵幇宸ヨ壓璁剧疆鍔ㄦ�佹坊鍔犳牱寮�
+*/
+
+.orderNumber{
+
+}
+.el-icon-edit {
+ width: 16px;
+ height: 16px;
+ border-radius: 50%;
+ padding: 3px 0 0 3px;
+ margin-left: 5px;
+ cursor: pointer;
+}
+
+.el-icon-edit:hover {
+ background-color: #99a9bf;
+ color: #FFFFFF;
+}
+
+.el-tag--dark {
+ background-color: $main_color;
+ border-color: $main_color;
+}
+
+.tagSuccess {
+ margin-left: 20px;
+ width: 100px;
+ height: 32px;
+ display: flex;
+ justify-content: center;
+ color: $main_color;
+}
+
+::v-deep .el-tag__close {
+ padding: 1px 0 0 1px !important;
+}
+::v-deep .el-tag__close:hover {
+ background-color: #99a9bf;
+}
+
+::v-deep .el-button--success {
+ width: 40px !important;
+ background-color: #ecf5ff;
+ border-radius: 0;
+ color: $main_color;
+}
+
+::v-deep .el-tag {
+ //height: 30px;
+ border-radius: 0;
+}
+
+::v-deep .el-input--small .el-input__inner {
+ border-radius: 0;
+}
+
+.settingDiv {
+ display: flex;
+ width: 100%;
+ height: 40px;
+ overflow-y: scroll;
+ align-items: center;
+}
+
+.elTag {
+ margin-left: 0;
+ width: 100px;
+ position: relative;
+}
+
</style>
--
Gitblit v1.9.3