diff --git a/src/assets/img/logo-1.png b/src/assets/img/logo-1.png new file mode 100644 index 0000000..3021b9a Binary files /dev/null and b/src/assets/img/logo-1.png differ diff --git a/src/pages/Middle/Mold/Touch/Reporting.vue b/src/pages/Middle/Mold/Touch/Reporting.vue index b352b92..501b733 100644 --- a/src/pages/Middle/Mold/Touch/Reporting.vue +++ b/src/pages/Middle/Mold/Touch/Reporting.vue @@ -17,7 +17,8 @@
-
部门:{{ item.department_detail.name }}
+
部门:{{ item.department_detail.name }} +
部件:{{ item.component_detail ? item.component_detail.name : '' }}
工序:{{ item.process_detail ? item.process_detail.name : '' }}
@@ -67,7 +68,8 @@
-
部门:{{ item.department_detail.name }}
+
部门:{{ item.department_detail.name + }}
工序:{{ item.process_detail ? item.process_detail.name : '' }}
状态: @@ -86,12 +88,12 @@ 撤销报工
-
- 计划完成:{{ getDateValueString(item.plan_complete_time) }} -
+
+ 计划完成:{{ getDateValueString(item.plan_complete_time) }} +
-
+
@@ -166,15 +168,16 @@ + - - + + - + title="模具" width="auto"> + @@ -187,6 +190,7 @@ + @@ -934,7 +938,7 @@ export default { progress = parseFloat(progress).toFixed(2); } return progress; - + }, }, @@ -1024,11 +1028,21 @@ export default { } .container { - display: flex; - justify-content: space-between; - margin-top: 10px; + display: grid; + grid-template-columns: 10fr 13fr; + grid-gap: 0px; + } +.left {} + +.right { + margin-left: 10px; + overflow: hidden; +} + + + .card { background-color: white; margin-top: 10px; @@ -1042,14 +1056,6 @@ export default { font-size: 22px; } -.left { - flex: 5; -} - -.right { - flex: 5; - margin-left: 10px; -} .card .vxe-form .vxe-form--item-inner { min-height: 24px; diff --git a/src/pages/login/Login.vue b/src/pages/login/Login.vue index 26c41e4..3493478 100644 --- a/src/pages/login/Login.vue +++ b/src/pages/login/Login.vue @@ -4,6 +4,7 @@
+
{{ Project.project_name }} | {{ Project.project_sub_title }} @@ -112,7 +113,10 @@ export default { mobile: '', password: '' }, - Project: [], + Project: [ + { + project_logo: '@/assets/img/logo-1.png', + }], companyShow: false, companyData: [], company: Cookie.get('company'), @@ -121,7 +125,7 @@ export default { }, computed: { }, - beforeMount() { // 页面挂载之前 + beforeCreate() { // 页面挂载之前 getProject().then(result => { // 获取项目信息 this.Project = result.data.data @@ -149,8 +153,8 @@ export default { password: this.user.password }); - this.$refs.loginActions.initRoutes({ }); - + this.$refs.loginActions.initRoutes({}); + }, 1000) }) // loadsh的pick方法