diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue index 8285f25..b4e346f 100644 --- a/src/page/login/userlogin.vue +++ b/src/page/login/userlogin.vue @@ -124,7 +124,6 @@ export default { let arr = document.cookie.split("; "); for (let i = 0; i < arr.length; i++) { let arr2 = arr[i].split("="); - console.log(arr2) if (arr2[0] === "username") { this.loginForm.username = arr2[1]; } else if (arr2[0] === "password") { @@ -179,6 +178,7 @@ export default { localStorage.setItem("agentId", ""); that.$router.push({ path: "/wel" }); } + // 当他为其他时 先获取是否只有一个选项,然后在来进行判断 if (idx == 1) { this.getAgentList(); @@ -196,6 +196,11 @@ export default { // that.$router.push({ path: "/chose", query: { flag: 3 } }); } } else { + if (this.rememberPwd) { + this.setCookie(this.loginForm.username, this.loginForm.password, 7); + } else { + this.setCookie("", "", -1); + } that.$router.push({ path: "/check" }); } }); diff --git a/src/page/wel.vue b/src/page/wel.vue index 8d0328e..abefa44 100644 --- a/src/page/wel.vue +++ b/src/page/wel.vue @@ -18,7 +18,7 @@
-
+
正在接待
@@ -1861,7 +1861,135 @@ export default { } } } + .nopagechen { + flex: 1; + // min-width: 190px; + background: #ffffff; + box-shadow: 0px 0px 12px 0px rgba(0, 0, 0, 0.04); + border-radius: 4px; + // margin-right: 20px; + padding: 12px; + border-bottom: 3px solid #fff; + transition: all 0.3s linear; + + .pageboxtitle1 { + width: 100%; + font-size: 16px; + font-weight: 400; + color: #666666; + line-height: 16px; + } + + .projectCardItem { + .sum { + .span1 { + width: 100px; + height: 30px; + font-size: 30px; + font-weight: normal; + color: #32363d; + line-height: 30px; + margin-top: 10px; + } + } + } + + .projectColumn { + display: flex; + flex-direction: column; + + + .span2 { + font-size: 14px !important; + align-items: center !important; + + .span2-2 { + display: flex; + font-weight: 600; + color: rgba(231, 72, 60, 1); + background: rgba(253, 240, 239, 1); + align-items: center; + padding: 3px 12px; + border-radius: 3px; + + .up { + display: block; + width: 20px; + height: 15px; + background: url("../../public/img/indexIcon/indexCardUp.png") no-repeat; + background-size: 100%; + margin-left: 8px; + } + } + .span2-3 { + display: flex; + font-weight: 600; + color: rgba(7, 183, 157, 1); + background: rgba(235, 250, 246, 1); + align-items: center; + padding: 3px 12px; + border-radius: 3px; + + .down { + display: block; + width: 20px; + height: 15px; + background: url("../../public/img/indexIcon/indexCardDown.png") no-repeat; + background-size: 100%; + margin-left: 8px; + } + } + } + } + + .pageboxtitle2 { + width: 100%; + margin-top: 14px; + display: flex; + flex-wrap: wrap; + + .span1 { + width: 100px; + height: 30px; + font-size: 30px; + font-weight: normal; + color: #32363d; + line-height: 30px; + } + + .span2 { + height: 30px; + font-size: 16px; + display: flex; + align-items: flex-end; + + .span2-1 { + color: #424d64; + margin-right: 15px; + font-weight: 400; + } + + .span2-2 { + display: flex; + font-weight: 600; + color: rgba(231, 72, 60, 1); + } + + .span2-3 { + display: flex; + font-weight: 600; + color: rgba(7, 183, 157, 1); + } + } + } + + .pageboxtitle3 { + text-align: center; + font-size: 30px; + line-height: 44px; + } + } .pagechen { flex: 1; // min-width: 190px; diff --git a/src/views/Customer/AgentManagement.vue b/src/views/Customer/AgentManagement.vue index 49e70f8..97a2467 100644 --- a/src/views/Customer/AgentManagement.vue +++ b/src/views/Customer/AgentManagement.vue @@ -1186,4 +1186,14 @@ export default { .div-inp { width: 250px; } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/Customer/CompanyRecord.vue b/src/views/Customer/CompanyRecord.vue index 6e3fbca..2bd2fa2 100644 --- a/src/views/Customer/CompanyRecord.vue +++ b/src/views/Customer/CompanyRecord.vue @@ -1203,4 +1203,14 @@ export default { } } } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/Customer/Companymanagement.vue b/src/views/Customer/Companymanagement.vue index 5a6640d..28bf5b9 100644 --- a/src/views/Customer/Companymanagement.vue +++ b/src/views/Customer/Companymanagement.vue @@ -1015,6 +1015,16 @@ export default { diff --git a/src/views/Customer/index.vue b/src/views/Customer/index.vue index eb08191..a8e4394 100644 --- a/src/views/Customer/index.vue +++ b/src/views/Customer/index.vue @@ -915,4 +915,14 @@ export default { color: #ffffff; background: #2671e2; } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/Customer/source.vue b/src/views/Customer/source.vue index 3cc38a4..e3dc690 100644 --- a/src/views/Customer/source.vue +++ b/src/views/Customer/source.vue @@ -510,4 +510,14 @@ export default { } } } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/Equipment/equipmentDetailList.vue b/src/views/Equipment/equipmentDetailList.vue index 4b6dd52..f62d097 100644 --- a/src/views/Equipment/equipmentDetailList.vue +++ b/src/views/Equipment/equipmentDetailList.vue @@ -1760,4 +1760,14 @@ export default { .demonstration { line-height: 36px; } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/Equipment/equipmentOnlineRecordList.vue b/src/views/Equipment/equipmentOnlineRecordList.vue index 21a1c56..39cd714 100644 --- a/src/views/Equipment/equipmentOnlineRecordList.vue +++ b/src/views/Equipment/equipmentOnlineRecordList.vue @@ -546,7 +546,17 @@ export default { }; - diff --git a/src/views/Equipment/state.vue b/src/views/Equipment/state.vue index 73086b6..db0cf0e 100644 --- a/src/views/Equipment/state.vue +++ b/src/views/Equipment/state.vue @@ -1561,4 +1561,14 @@ export default { .div-inp { width: 250px; } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/File/index.vue b/src/views/File/index.vue index 796e93b..7254f14 100644 --- a/src/views/File/index.vue +++ b/src/views/File/index.vue @@ -349,4 +349,14 @@ export default { box-shadow: 2px 2px 12px 4px #d5d5d5; } } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/ReceivingRecords/index.vue b/src/views/ReceivingRecords/index.vue index 133c721..516d6f7 100644 --- a/src/views/ReceivingRecords/index.vue +++ b/src/views/ReceivingRecords/index.vue @@ -857,4 +857,14 @@ export default { .div-inp { width: 250px; } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/Scheduling/index.vue b/src/views/Scheduling/index.vue index c9df0e0..f90bc1e 100644 --- a/src/views/Scheduling/index.vue +++ b/src/views/Scheduling/index.vue @@ -715,4 +715,14 @@ height: 400px !important; // /deep/ .wh_content_item_tag,.wh_content_item{ // color: black; // } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/Statistics/BuildingContrast.vue b/src/views/Statistics/BuildingContrast.vue index b4e94d9..810f072 100644 --- a/src/views/Statistics/BuildingContrast.vue +++ b/src/views/Statistics/BuildingContrast.vue @@ -619,6 +619,16 @@ export default { diff --git a/src/views/Statistics/ReceptionStatistical.vue b/src/views/Statistics/ReceptionStatistical.vue index 6645678..48f652c 100644 --- a/src/views/Statistics/ReceptionStatistical.vue +++ b/src/views/Statistics/ReceptionStatistical.vue @@ -813,4 +813,14 @@ export default { margin-left: 15px; min-width: 40px; } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/Statistics/TrendAnalysis.vue b/src/views/Statistics/TrendAnalysis.vue index effe544..dd15888 100644 --- a/src/views/Statistics/TrendAnalysis.vue +++ b/src/views/Statistics/TrendAnalysis.vue @@ -126,8 +126,8 @@ - 数据有所增长 - 数据有所下降 + 数据有所增长 + 数据有所下降
@@ -163,8 +163,8 @@ - 数据有所增长 - 数据有所下降 + 数据有所增长 + 数据有所下降
@@ -188,8 +188,7 @@
- - 环比:{{ cardobj.endSumDuration || 0 }}次 + 环比:{{ cardobj.endSumDuration || 0 }}次 +{{ cardobj.contrastSumDuration || 0 }} @@ -200,8 +199,8 @@ - 数据有所增长 - 数据有所下降 + 数据有所增长 + 数据有所下降
@@ -1261,10 +1260,19 @@ export default { width: 95%; .span2Card { - display: flex !important; - justify-content: space-between !important; - font-size: 14px !important; - align-items: center !important; + overflow: hidden; + display: flex; + align-items: center; + padding: 0 30px; + + span { + float: left; + } + + // display: flex !important; + // justify-content: space-between !important; + // font-size: 14px !important; + // align-items: center !important; .span2-2 { display: flex; @@ -1274,6 +1282,7 @@ export default { align-items: center; padding: 3px 12px; border-radius: 3px; + margin: 0 18px; .up { display: block; @@ -1456,7 +1465,7 @@ export default { .xia { width: 100%; font-size: 14px; - text-indent: 30px; + // text-indent: 30px; margin-bottom: 10px; .span1 { diff --git a/src/views/Template/PinspeakwordsList.vue b/src/views/Template/PinspeakwordsList.vue index facaa61..7ff913a 100644 --- a/src/views/Template/PinspeakwordsList.vue +++ b/src/views/Template/PinspeakwordsList.vue @@ -379,6 +379,17 @@ export default { diff --git a/src/views/Template/wrongword.vue b/src/views/Template/wrongword.vue index 5f939e0..6e8e93a 100644 --- a/src/views/Template/wrongword.vue +++ b/src/views/Template/wrongword.vue @@ -501,4 +501,14 @@ export default { } } } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/building/Count.vue b/src/views/building/Count.vue index 4bd7457..2920e81 100644 --- a/src/views/building/Count.vue +++ b/src/views/building/Count.vue @@ -722,4 +722,14 @@ export default { .div-inp { width: 250px; } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/building/area.vue b/src/views/building/area.vue index 1d3b833..d35c3cf 100644 --- a/src/views/building/area.vue +++ b/src/views/building/area.vue @@ -368,5 +368,15 @@ export default { } } } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +} diff --git a/src/views/building/index.vue b/src/views/building/index.vue index 7cb54dc..9957c74 100644 --- a/src/views/building/index.vue +++ b/src/views/building/index.vue @@ -1339,4 +1339,14 @@ export default { .div-inp { width: 250px; } +/deep/ .el-table__header-wrapper{ + thead{ + tr{ + th{ + background: #F5F7FA; + color: #333333; + } + } + } +}