From 063d116b32455f1bd0841933512c84f3be8f42f9 Mon Sep 17 00:00:00 2001
From: zxx <47968546@163.com>
Date: Tue, 24 Oct 2023 17:19:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=86=E8=A7=A6=E6=91=B8?=
 =?UTF-8?q?=E5=B1=8F=E6=8A=A5=E5=B7=A5=E9=A1=B5=E9=9D=A2=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/logo-1.png                 | Bin 0 -> 7425 bytes
 src/pages/Middle/Mold/Touch/Reporting.vue |  52 ++++++++++++----------
 src/pages/login/Login.vue                 |  12 +++--
 3 files changed, 37 insertions(+), 27 deletions(-)
 create mode 100644 src/assets/img/logo-1.png

diff --git a/src/assets/img/logo-1.png b/src/assets/img/logo-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..3021b9abe82922a2bc94b98393a699cfb56d3f67
GIT binary patch
literal 7425
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

literal 0
HcmV?d00001

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 @@
                 <div class="gx-item">
                   <div class="gx-item-col">
 
-                    <div v-if="item.department_detail && item.department_detail.name">部门：{{ item.department_detail.name }}</div>
+                    <div v-if="item.department_detail && item.department_detail.name">部门：{{ item.department_detail.name }}
+                    </div>
                     <div>部件：{{ item.component_detail ? item.component_detail.name : '' }}</div>
                     <div>工序：{{ item.process_detail ? item.process_detail.name : '' }}</div>
 
@@ -67,7 +68,8 @@
                   <div class="gx-item">
                     <div class="gx-item-col">
 
-                      <div v-if="item.department_detail && item.department_detail.name">部门：{{ item.department_detail.name }}</div>
+                      <div v-if="item.department_detail && item.department_detail.name">部门：{{ item.department_detail.name
+                      }}</div>
                       <div>工序：{{ item.process_detail ? item.process_detail.name : '' }}</div>
 
                       <div>状态：
@@ -86,12 +88,12 @@
                         <a-button style="margin-left: 3px;" @click="pageReport(item, true)"
                           v-if="item.is_complete == 1">撤销报工</a-button>
                       </div>
-                    <div style="margin-top: 10px;font-size: 14px;" v-if="item.plan_complete_time">
-                      计划完成:{{ getDateValueString(item.plan_complete_time) }}
-                    </div>
+                      <div style="margin-top: 10px;font-size: 14px;" v-if="item.plan_complete_time">
+                        计划完成:{{ getDateValueString(item.plan_complete_time) }}
+                      </div>
 
                     </div>
-                  </div> 
+                  </div>
 
                 </div>
 
@@ -166,15 +168,16 @@
             <a-tab-pane key="2" tab="即将超时布产列表" force-render>
               <vxe-table border show-overflow keep-source ref="xTable3" :height="610" :row-config="{ height: 80 }"
                 :data="poData">
+
                 <vxe-column field="code" title="编码" width="130"></vxe-column>
-                <vxe-column field="mold_master_name" title="模具师傅" width="130"></vxe-column>
-                <vxe-column field="engineer_name" title="工程师傅" width="130"></vxe-column>
+                <vxe-column field="mold_master_name" title="模具师傅" width="110"></vxe-column>
+                <vxe-column field="engineer_name" title="工程师傅" width="110"></vxe-column>
                 <vxe-column field="complete_time" formatter="formatDate" title="要求完成时间" width="160"></vxe-column>
                 <vxe-column field="mold_detail" formatter="formatRef" :params="{ dataType: 'object', textField: 'name' }"
-                  title="模具" width="130"></vxe-column>
-                <vxe-column title="模具图片" width="110">
+                  title="模具" width="auto"></vxe-column>
+                <vxe-column title="图片" width="75">
                   <template #default="{ row }">
-                    <img v-if="row.mold_detail.image" style="width:50px;height:50px;" :src="row.mold_detail.image"
+                    <img v-if="row.mold_detail.image" style="width:52px;height:52px;" :src="row.mold_detail.image"
                       @click.stop="$hevueImgPreview(row.mold_detail.image)" />
                     <span v-else></span>
                   </template>
@@ -187,6 +190,7 @@
               </vxe-table>
 
 
+
             </a-tab-pane>
           </a-tabs>
 
@@ -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 @@
       <div class="header">
         <img alt="logo" class="logo" :src="Project.project_logo" />
 
+
         <div class="title">{{ Project.project_name }}
           <!-- 如果 Project.project_sub_title 不为空，则显示 -->
           <i v-if="Project.project_sub_title"><b>|</b> {{ Project.project_sub_title }}</i>
@@ -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方法