diff --git a/public/favicon (2).png b/public/favicon (2).png deleted file mode 100644 index 3c2feb5..0000000 Binary files a/public/favicon (2).png and /dev/null differ diff --git a/src/lang/zh.js b/src/lang/zh.js index f675957..74b2497 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -1,6 +1,6 @@ export default { tip: '提示', - title: '新疆甘泉堡源荷储一体化控制系统', + title: '一体化控制系统', logoutTip: '退出系统, 是否继续?', submitText: '确定', cancelText: '取消', diff --git a/src/page/index/logo.vue b/src/page/index/logo.vue index 0348403..585bcce 100644 --- a/src/page/index/logo.vue +++ b/src/page/index/logo.vue @@ -13,7 +13,7 @@
- 新疆甘泉堡源荷储一体化控制系统 + 一体化控制系统
diff --git a/src/page/index/sidebar/index.vue b/src/page/index/sidebar/index.vue index 300f8c0..1cb0216 100644 --- a/src/page/index/sidebar/index.vue +++ b/src/page/index/sidebar/index.vue @@ -37,7 +37,6 @@ export default { }; }, created() { - // this.menuData = this.code ? this.menu : this.someMethod('system'); let menuList = window.sessionStorage.getItem('master-menuAll'); let code = 'system'; if (this.code) { @@ -58,7 +57,6 @@ export default { mounted() {}, methods: { someMethod(code) { - console.log(code) let sidebar = document.querySelector('.avue-left'); let mainContent = document.querySelector('.avue-main'); let newWidth = '240px'; diff --git a/src/page/login/index.vue b/src/page/login/index.vue index 148c4e3..1c161af 100644 --- a/src/page/login/index.vue +++ b/src/page/login/index.vue @@ -6,7 +6,7 @@
diff --git a/src/styles/element-ui.scss b/src/styles/element-ui.scss index 15ffb80..35508eb 100644 --- a/src/styles/element-ui.scss +++ b/src/styles/element-ui.scss @@ -70,3 +70,21 @@ //padding: 16px !important; } +.el-select-dropdown__wrap.el-scrollbar__wrap { + margin-bottom: 0 !important; +} + +body .el-table th.gutter { + display: table-cell !important; +} + +body .el-table colgroup.gutter { + display: table-cell !important; +} + +table { + width: 100% !important; +} +.el-table__header th { + line-height: 49px; /* 设置你想要的行高 */ +} diff --git a/src/views/smart/workorder.vue b/src/views/smart/workorder.vue index 2f82a0b..2bd90c3 100644 --- a/src/views/smart/workorder.vue +++ b/src/views/smart/workorder.vue @@ -70,7 +70,7 @@ diff --git a/src/views/system/user.vue b/src/views/system/user.vue index a547675..9acd8cd 100644 --- a/src/views/system/user.vue +++ b/src/views/system/user.vue @@ -504,7 +504,7 @@ this.$message.warning("请选择至少一条数据"); return; } - this.$confirm("确定将选择账号密码重置为123456?", { + this.$confirm("确定将选择账号密码重置为【8Nn!yjWKpR】?", { confirmButtonText: "确定", cancelButtonText: "取消", type: "warning" diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue index 4a9366c..64ffc59 100644 --- a/src/views/wel/index.vue +++ b/src/views/wel/index.vue @@ -43,7 +43,7 @@ && !homePageData.equipmentLedgerAudit">
-
+
待审核设备台账
@@ -54,7 +54,7 @@
{{item.toolsCodeId}}号工器具编码待审核
-
+
待审核智能两票
@@ -65,11 +65,16 @@
{{item.workTicketNo}}号工作票待审核
-
+
待审核备件管理
-
+
{{item.code}}号仓库待审核
@@ -88,7 +93,7 @@
{{item.outboundNo}}号出库待审核
-
+
待审核工单