diff --git a/src/page/index/index.vue b/src/page/index/index.vue
index 25094d7..5da4724 100644
--- a/src/page/index/index.vue
+++ b/src/page/index/index.vue
@@ -7,11 +7,13 @@
+
+
-
+
-
+
@@ -37,6 +39,7 @@ import tags from "./tags";
import top from "./top/";
import sidebar from "./sidebar/";
import admin from "@/util/admin";
+import topMenu from "./top-menu";
// import { validatenull } from "@/util/validate";
// import { calcDate } from "@/util/date.js";
// import { getStore } from "@/util/store.js";
@@ -44,7 +47,8 @@ export default {
components: {
top,
tags,
- sidebar
+ sidebar,
+ topMenu
},
name: "index",
data() {
@@ -98,7 +102,15 @@ export default {
});
}
}, 10000);*/
+ },
+ switchMenu(code) {
+ this.$refs.sidebar.someMethod(code);
}
}
};
+
diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue
index a1359e4..6b4e4e4 100644
--- a/src/page/index/logo.vue
+++ b/src/page/index/logo.vue
@@ -13,9 +13,8 @@
-

{{website.indexTitle}}
+ 新疆甘泉堡源荷储一体化控制系统
+
@@ -52,10 +51,10 @@ export default {
position: fixed;
top: 0;
left: 0;
- width: 240px;
+ width: 400px;
height: 64px;
line-height: 64px;
- background-color: #20222a;
+ background: linear-gradient(to right, #053B7F, #050F22);
font-size: 20px;
overflow: hidden;
box-sizing: border-box;
@@ -65,8 +64,8 @@ export default {
&_title {
display: block;
text-align: center;
- font-weight: 300;
- font-size: 16px;
+ font-weight: bold;
+ font-size: x-large;
div {
display: flex;
align-items: center;
@@ -86,4 +85,7 @@ export default {
color: #fff;
}
}
+.avue-logo_title {
+ color: #ffffff
+}
diff --git a/src/page/index/sidebar/index.vue b/src/page/index/sidebar/index.vue
index d7edceb..84a72d8 100644
--- a/src/page/index/sidebar/index.vue
+++ b/src/page/index/sidebar/index.vue
@@ -1,19 +1,21 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
{{userInfo.userName}}
@@ -78,14 +21,18 @@
{{$t('navbar.dashboard')}}
-
- {{$t('navbar.userinfo')}}
-
+
+
+
{{$t('navbar.logOut')}}
+
+
+ {{time}}
+
diff --git a/src/page/index/top/top-menu.vue b/src/page/index/top/top-menu.vue
index f92d474..b52b326 100644
--- a/src/page/index/top/top-menu.vue
+++ b/src/page/index/top/top-menu.vue
@@ -72,4 +72,4 @@ export default {
}
}
};
-
\ No newline at end of file
+
diff --git a/src/page/index/top/top-navigation.vue b/src/page/index/top/top-navigation.vue
new file mode 100644
index 0000000..a6e4c5b
--- /dev/null
+++ b/src/page/index/top/top-navigation.vue
@@ -0,0 +1,79 @@
+
+
+
+
+
+
+ {{ item.name }}
+
+
+
+
+
+
+
+
+
+
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss
index beb4ed4..15ffb80 100644
--- a/src/styles/element-ui.scss
+++ b/src/styles/element-ui.scss
@@ -16,6 +16,7 @@
}
.el-menu {
+ width: 240px;
border-right: none !important;
}
diff --git a/src/styles/media.scss b/src/styles/media.scss
index 44bede4..6aaf17e 100644
--- a/src/styles/media.scss
+++ b/src/styles/media.scss
@@ -10,7 +10,7 @@
.avue-contail {
width: 100%;
height: 100%;
- background: #f0f2f5;
+ background: #050F23;
background-size: 100%;
background-repeat: no-repeat;
}
@@ -20,7 +20,7 @@
position: fixed;
left: 0;
top: 0;
- width: 240px;
+ width: 0px;
height: 100%;
z-index: 1025;
}
@@ -46,15 +46,29 @@
box-sizing: border-box;
}
+//.avue-main {
+// position: absolute;
+// left: 240px;
+// padding: 0;
+// padding-bottom: 20px;
+// width: calc(100% - 240px);
+// height: calc(100% - 70px);
+// box-sizing: border-box;
+// overflow: hidden;
+//}
.avue-main {
- position: absolute;
- left: 240px;
- padding: 0;
- padding-bottom: 20px;
- width: calc(100% - 240px);
- height: calc(100% - 70px);
- box-sizing: border-box;
- overflow: hidden;
+ position: unset;
+ left: 0px;
+ padding: 0;
+ padding-bottom: 20px;
+ width: 100%;
+ height: calc(100% - 70px);
+ box-sizing: border-box;
+ overflow: hidden;
+}
+
+.el-card__body {
+ background-color: aliceblue;
}
.avue-view {
@@ -162,4 +176,4 @@
display: block;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/styles/sidebar.scss b/src/styles/sidebar.scss
index 96edd24..e270af6 100644
--- a/src/styles/sidebar.scss
+++ b/src/styles/sidebar.scss
@@ -30,15 +30,15 @@
}
}
}
-
+
}
.avue-sidebar {
- user-select: none;
+ margin-top: 100px;
+ user-select: none;
position: relative;
- padding-top: 60px;
height: 100%;
position: relative;
- background-color: #20222a;
+ background-color: #09172b;
transition: width .2s;
box-sizing: border-box;
box-shadow: 2px 0 6px rgba(0,21,41,.35);
@@ -87,4 +87,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/src/styles/tags.scss b/src/styles/tags.scss
index 283be5e..6238c16 100644
--- a/src/styles/tags.scss
+++ b/src/styles/tags.scss
@@ -1,14 +1,14 @@
.avue-tags {
- user-select: none;
+ user-select: none;
position: relative;
padding: 0 10px;
margin-bottom: 10px;
box-sizing: border-box;
overflow: hidden;
- border-top: 1px solid #f6f6f6;
- background-color: #fff;
+ //border-top: 1px solid #f6f6f6;
+ background-color: #050F23;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, .05);
.el-tabs--card>.el-tabs__header {
margin: 0;
@@ -89,4 +89,21 @@
padding: 1px 0 0 15px;
box-sizing: border-box;
}
-}
\ No newline at end of file
+}
+
+.avue-tags .el-tabs--card > .el-tabs__header .el-tabs__item.is-active {
+ color: #ffffff;
+ //border-bottom: 3px solid #ffffff00;
+ background-color: #064291;
+ border: 1px solid #ffff;
+ border-radius: 4px;
+}
+
+.avue-tags .el-tabs--card > .el-tabs__header .el-tabs__item {
+ line-height: 27px;
+ height: 30px;
+}
+
+.el-tabs__nav-scroll {
+ margin-top: 12px;
+}
diff --git a/src/styles/theme/hey.scss b/src/styles/theme/hey.scss
index cc4a4fe..7ecea56 100644
--- a/src/styles/theme/hey.scss
+++ b/src/styles/theme/hey.scss
@@ -42,4 +42,4 @@
border-bottom: none !important;
}
}
-}
\ No newline at end of file
+}
diff --git a/src/styles/top.scss b/src/styles/top.scss
index a39bb81..06aba8e 100644
--- a/src/styles/top.scss
+++ b/src/styles/top.scss
@@ -1,4 +1,5 @@
.avue-top {
+ background: linear-gradient(to right, #0C1C3B, #050F22);
padding: 0 20px;
position: relative;
box-shadow: 0 1px 2px 0 rgba(0, 0, 0, 0.15);
@@ -34,7 +35,7 @@
.top-search {
line-height: 64px;
position: absolute !important;
- left: 20px;
+ left: 120px;
top:0;
width: 400px !important;
.el-input__inner {
diff --git a/src/util/store.js b/src/util/store.js
index 6388ec2..070db2d 100644
--- a/src/util/store.js
+++ b/src/util/store.js
@@ -118,4 +118,4 @@ export const clearStore = (params = {}) => {
window.localStorage.clear()
}
-}
\ No newline at end of file
+}
diff --git a/src/views/smart/workorder.vue b/src/views/smart/workorder.vue
index 60e425d..3ba6bd9 100644
--- a/src/views/smart/workorder.vue
+++ b/src/views/smart/workorder.vue
@@ -197,13 +197,6 @@
{
label: "维护作业类型",
prop: "maintenanceTaskType",
- search: true,
- type: "select",
- dicUrl: "/api/daf-system/dict/dictionary?code=maintenance_job_type",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
span: 8
},
{
@@ -314,12 +307,6 @@
{
label: "工单完成",
prop: "handlingResult",
- type: "select",
- dicUrl: "/api/daf-system/dict/dictionary?code=workorder_process_res",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
},
{
label: "审核状态",
diff --git a/src/views/smart/workorderDetail.vue b/src/views/smart/workorderDetail.vue
index 22b96b9..07ae03f 100644
--- a/src/views/smart/workorderDetail.vue
+++ b/src/views/smart/workorderDetail.vue
@@ -218,14 +218,12 @@
}]
}, {
label: "维护作业类型",
- type: "select",
- dicUrl: "/api/daf-system/dict/dictionary?code=maintenance_job_type",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
prop: "maintenanceTaskType",
- span: 8
+ type: 'textarea',
+ minRows: 1,
+ maxRows: 3,
+ span: 8,
+ maxlength: 400
}, {
label: "用户状态",
prop: "userStatus",
@@ -281,13 +279,11 @@
}, {
label: "处理结果",
prop: "handlingResult",
- type: "select",
+ type: 'textarea',
+ minRows: 1,
+ maxRows: 3,
span: 8,
- dicUrl: "/api/daf-system/dict/dictionary?code=workorder_process_res",
- props: {
- label: "dictValue",
- value: "dictKey"
- },
+ maxlength: 400
},
]