From 2e3310c1c752e5f50c25ef791f8d051457c89048 Mon Sep 17 00:00:00 2001
From: lb <liubin_9396@163.com>
Date: Mon, 14 Nov 2022 14:12:22 +0800
Subject: [PATCH] update

---
 src/App.vue                                   |  4 +++-
 src/layout/components/Sidebar/Logo.vue        |  2 +-
 src/views/EquipmentManager/HomePage.vue       |  6 +++---
 .../components/TechyVerticalTable.vue         |  4 +++-
 src/views/EquipmentManager/mockData.js        | 19 ++++++++++++++++++-
 src/views/QualityManager/HomePage.vue         |  4 ++--
 .../components/charts/newBar.vue              |  3 ++-
 7 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 4d0df89..f0b6f36 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -16,7 +16,9 @@ export default {
     })
   },
   data() {
-    beilv: 1
+    return {
+      beilv: 1
+    }
   }
 }
 </script>
diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue
index 0e64a01..bcee86b 100644
--- a/src/layout/components/Sidebar/Logo.vue
+++ b/src/layout/components/Sidebar/Logo.vue
@@ -82,7 +82,7 @@ export default {
       display: inline-block;
       margin: 0;
       color: #fff;
-      width: calc(189px * var(--beilv));
+      // width: calc(189px * var(--beilv));
       overflow: hidden;
       text-overflow: ellipsis;
       white-space: nowrap;
diff --git a/src/views/EquipmentManager/HomePage.vue b/src/views/EquipmentManager/HomePage.vue
index 2ae2f9b..9baf2da 100644
--- a/src/views/EquipmentManager/HomePage.vue
+++ b/src/views/EquipmentManager/HomePage.vue
@@ -11,7 +11,7 @@
               <div class="table-wrapper fix-table-exception-report">
                 <techy-table
                   :page="1"
-                  :limit="7"
+                  :limit="12"
                   :show-index="false"
                   :table-config="equipmentExceptionProps"
                   :table-data="equipmentExceptionDatalist"
@@ -25,7 +25,7 @@
               <div class="table-wrapper fix-table-eq-exception">
                 <techy-table
                   :page="1"
-                  :limit="7"
+                  :limit="12"
                   :show-index="false"
                   :table-config="equipmentAlarmProps"
                   :table-data="equipmentAlarmDatalist"
@@ -80,7 +80,7 @@
             <div class="table-wrapper fix-table-exception-report">
               <techy-table
                 :page="1"
-                :limit="7"
+                :limit="12"
                 :show-index="false"
                 :table-config="sparepartsProps"
                 :table-data="sparepartsDatalist"
diff --git a/src/views/EquipmentManager/components/TechyVerticalTable.vue b/src/views/EquipmentManager/components/TechyVerticalTable.vue
index 1369150..2a4900b 100644
--- a/src/views/EquipmentManager/components/TechyVerticalTable.vue
+++ b/src/views/EquipmentManager/components/TechyVerticalTable.vue
@@ -56,7 +56,7 @@ export default {
 
 .thead,
 .tbody {
-  min-width: calc(100vw / 1920 * 96);
+  /* min-width: calc(100vw / 1920 * 96); */
   background-color: #20376080;
   white-space: nowrap;
   overflow: hidden;
@@ -65,6 +65,8 @@ export default {
   padding-left: calc(12px * var(--beilv));
   padding-right: calc(12px * var(--beilv));
   font-weight: 400;
+  flex: 0 1 calc(100vw / 1920 * 96);
+  text-overflow: ellipsis;
 }
 
 .thead {
diff --git a/src/views/EquipmentManager/mockData.js b/src/views/EquipmentManager/mockData.js
index 67b6722..f21bc24 100644
--- a/src/views/EquipmentManager/mockData.js
+++ b/src/views/EquipmentManager/mockData.js
@@ -49,6 +49,11 @@ export const equipmentExceptionDatalist = [
   { 'eqName': 'A2一次固化机', 'pl': 'C线', 'content': '向江比把设', 'creator': '夏敏', 'time': '1996-12-22 09:29:57', 'priority': 3 },
   { 'eqName': 'A2一次固化机', 'content': '统山数里们步在', 'creator': '龙洋', 'time': '1989-07-19 05:01:55', 'priority': 3 },
   { 'eqName': 'A钢化炉', 'content': '快制放产口快', 'creator': '金艳', 'time': '1987-02-25 18:45:17', 'priority': 4 },
+  { 'eqName': 'A1预热机', 'pl': 'D线', 'content': '说资把话', 'creator': '曾刚', 'time': '1985-01-29 23:21:53', 'priority': 3 },
+  { 'eqName': 'A钢化炉', 'content': '即压连识打', 'creator': '张杰', 'time': '1975-05-12 18:54:07', 'priority': 2 },
+  { 'eqName': 'A2一次固化机', 'pl': 'C线', 'content': '向江比把设', 'creator': '夏敏', 'time': '1996-12-22 09:29:57', 'priority': 3 },
+  { 'eqName': 'A2一次固化机', 'content': '统山数里们步在', 'creator': '龙洋', 'time': '1989-07-19 05:01:55', 'priority': 3 },
+  { 'eqName': 'A钢化炉', 'content': '快制放产口快', 'creator': '金艳', 'time': '1987-02-25 18:45:17', 'priority': 4 },
   { 'eqName': 'A1一次固化机', 'content': '住指时化统高线', 'creator': '顾敏', 'time': '1982-05-09 15:28:29', 'priority': 1 },
   { 'eqName': 'B1二次镀膜机', 'pl': 'B线', 'content': '命些种保较会', 'creator': '罗秀英', 'time': '1986-04-02 07:40:03', 'priority': 2 },
   { 'pl': 'B线', 'content': '增元少号安场明去在亲', 'creator': '于丽', 'time': '2004-08-11 11:10:57', 'priority': 4 }]
@@ -94,6 +99,14 @@ export const equipmentAlarmDatalist = [
   { 'eqName': 'A1预热机', 'eqCode': 'SB743966', 'pl': 'D线', 'content': '经府极元算进', 'priority': 2 },
   { 'eqName': 'B1一次冷却机', 'eqCode': 'SB138810', 'pl': 'E线', 'content': '代利值才之', 'priority': 1 },
   { 'eqName': 'A2一次冷却机', 'eqCode': 'SB861428', 'pl': 'D线', 'content': '还总速活直', 'priority': 3 },
+  { 'eqName': 'B1二次镀膜机', 'eqCode': 'SB788842', 'pl': 'D线', 'content': '了进改京人表无当市手', 'priority': 2 },
+  { 'eqName': 'A1预热机', 'eqCode': 'SB743966', 'pl': 'D线', 'content': '经府极元算进', 'priority': 2 },
+  { 'eqName': 'B1一次冷却机', 'eqCode': 'SB138810', 'pl': 'E线', 'content': '代利值才之', 'priority': 1 },
+  { 'eqName': 'A2一次冷却机', 'eqCode': 'SB861428', 'pl': 'D线', 'content': '还总速活直', 'priority': 3 },
+  {
+    'eqName': 'B1一次冷却机', 'eqCode': 'SB88566', 'content': '么中相育成他', 'priority': 4
+  },
+  { 'eqName': 'A2一次冷却机', 'eqCode': 'SB861428', 'pl': 'D线', 'content': '还总速活直', 'priority': 3 },
   {
     'eqName': 'B1一次冷却机', 'eqCode': 'SB88566', 'content': '么中相育成他', 'priority': 4
   },
@@ -142,6 +155,10 @@ export const sparepartsDatalist = [
   { 'name': '丝印', 'eq': 'A1一次固化机', 'update_time': '1980-01-17 04:29:56', 'remain': 73, 'stock': 305, 'location': '库位68' },
   { 'name': '激光打孔', 'eq': 'A2一次冷却机', 'pl': 'B线', 'update_time': '2014-02-25 17:19:43', 'remain': 36, 'stock': 199, 'location': '库位86' },
   { 'name': '上片机器人', 'eq': 'A2一次冷却机', 'pl': 'C线', 'update_time': '2017-01-23 17:01:29', 'remain': -3, 'stock': 146, 'location': '库位79' },
+  { 'name': '激光打孔', 'eq': 'A1磨边清洗机', 'pl': 'B线', 'update_time': '2002-04-07 19:13:29', 'remain': 62, 'stock': 4366, 'location': '库位99' },
+  { 'name': '丝印', 'eq': 'A1一次固化机', 'update_time': '1980-01-17 04:29:56', 'remain': 73, 'stock': 305, 'location': '库位68' },
+  { 'name': '激光打孔', 'eq': 'A2一次冷却机', 'pl': 'B线', 'update_time': '2014-02-25 17:19:43', 'remain': 36, 'stock': 199, 'location': '库位86' },
+  { 'name': '上片机器人', 'eq': 'A2一次冷却机', 'pl': 'C线', 'update_time': '2017-01-23 17:01:29', 'remain': -3, 'stock': 146, 'location': '库位79' },
   { 'name': '镀膜', 'eq': 'A2一次固化机', 'pl': 'D线', 'update_time': '2013-02-19 01:29:19', 'remain': 37, 'stock': 6977, 'location': '库位85' },
   { 'name': '激光打孔', 'eq': 'A1预热机', 'pl': 'B线', 'update_time': '1972-04-26 06:54:43', 'remain': -82, 'stock': 5039, 'location': '库位38' }
 ]
@@ -181,7 +198,7 @@ const StatusComponent = {
   },
   render: function (h) {
     return h('span', { style: { display: 'flex', /** justifyContent: 'center', */ alignItems: 'center', color: '#ffffffb3' } }, [
-      h('span', { style: { width: 'calc(16px * var(--beilv))', height: 'calc(16px * var(--beilv))', background: `url(${this.statusColor}) no-repeat`, backgroundSize: '100%', marginRight: 'calc(8px * var(--beilv))' } }, ''),
+      h('span', { style: { width: 'calc(16px * var(--beilv))', height: 'calc(16px * var(--beilv))', background: `url(${this.statusColor}) no-repeat`, backgroundPosition: '20%', backgroundSize: '100%',  marginRight: 'calc(8px * var(--beilv))' } }, ''),
       h('span', this.statusText)
     ])
   }
diff --git a/src/views/QualityManager/HomePage.vue b/src/views/QualityManager/HomePage.vue
index 760cbda..91826aa 100644
--- a/src/views/QualityManager/HomePage.vue
+++ b/src/views/QualityManager/HomePage.vue
@@ -43,8 +43,8 @@
                   <techy-box class="" style="padding: calc(16px * var(--beilv));">
                     <techy-analysis-header>缺陷分类分析</techy-analysis-header>
                     <new-bar
-                      :xlabel-font-size="8"
-                      :xlabel-rotate="20"
+                      :xlabel-font-size="10"
+                      :xlabel-rotate="30"
                       :name-list="[
                         '擦划伤1',
                         '擦划伤2',
diff --git a/src/views/QualityManager/components/charts/newBar.vue b/src/views/QualityManager/components/charts/newBar.vue
index df2fab4..b860b4f 100644
--- a/src/views/QualityManager/components/charts/newBar.vue
+++ b/src/views/QualityManager/components/charts/newBar.vue
@@ -277,6 +277,7 @@ export default {
   content: '';
   position: absolute;
   bottom: calc(36px * var(--beilv));
+  /* top: 63%; */
   left: 9%;
   height: calc(32px * var(--beilv));
   width: 90%;
@@ -288,7 +289,7 @@ export default {
   /* .process-fault-chart::before { */
   content: '';
   position: absolute;
-  bottom: 18%;
+  top: 65%;
   left: 8%;
   height: calc(32px * var(--beilv));
   /* bottom: calc(20px * var(--beilv));