From 8045c303ee68dd5605165712821e768a93b329d2 Mon Sep 17 00:00:00 2001
From: helloDy <1615073571@qq.com>
Date: Tue, 12 Mar 2024 18:02:16 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E7=BB=B4=E4=BF=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/repair/CustomDialogForm.vue          | 68 +++++++++++--------
 1 file changed, 39 insertions(+), 29 deletions(-)

diff --git a/src/views/equipment/base/repair/CustomDialogForm.vue b/src/views/equipment/base/repair/CustomDialogForm.vue
index ad0ff21e..a7b23222 100644
--- a/src/views/equipment/base/repair/CustomDialogForm.vue
+++ b/src/views/equipment/base/repair/CustomDialogForm.vue
@@ -6,41 +6,58 @@
 -->
 
 <template>
-  <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="disabled" class="drawer"
-    custom-class="mes-drawer" size="50%" @closed="$emit('destroy')">
+  <!-- <el-drawer :visible.sync="visible" :show-close="false" :wrapper-closable="disabled" class="drawer"
+    custom-class="mes-drawer" size="50%" @closed="$emit('destroy')"> -->
+  <el-dialog
+  :visible.sync="visible"
+  width="50%"
+  :before-close="closed">
     <small-title slot="title" :no-padding="true">
-      {{ disabled ? '查看详情' : !dataForm.maintenanceStatus ? '修改' : '完成' }}
+      详情
+      <!-- {{ disabled ? '查看详情' : !dataForm.maintenanceStatus ? '修改' : '完成' }} -->
     </small-title>
     <div class="drawer-body flex">
       <div class="drawer-body__content">
         <div>
           <el-row :gutter="20">
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="blodTip">故障发生时间</div>
               <div class="lightTip">{{ parseTime(dataForm.faultTime) }}</div>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="blodTip">故障级别</div>
               <div class="lightTip">{{ getDictDataLabel('fault-level', dataForm.faultLevel) }}</div>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="blodTip">故障类型</div>
               <div class="lightTip">{{ getDictDataLabel('fault-type', dataForm.faultType) }}</div>
             </el-col>
-          </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="blodTip">维修工</div>
               <div class="lightTip">{{ dataForm.repairman }}</div>
             </el-col>
-            <el-col :span="8">
+          </el-row>
+          <el-row :gutter="20">
+            <el-col :span="6">
               <div class="blodTip">联系方式</div>
               <div class="lightTip">{{ dataForm.repairmanPhone }}</div>
             </el-col>
-            <el-col :span="8">
+            <el-col :span="6">
               <div class="blodTip">维修方式</div>
               <div class="lightTip">{{ getDictDataLabel('repair-mode', dataForm.repairMode) }}</div>
             </el-col>
+            <el-col :span="6">
+              <div class="blodTip">创建时间</div>
+              <div class="lightTip">{{ parseTime(dataForm.createTime) }}</div>
+            </el-col>
+            <el-col :span="6">
+              <div class="blodTip">创建人</div>
+              <div class="lightTip">{{ dataForm.creator }}</div>
+            </el-col>
+          </el-row>
+          <el-row>
+            <div class="blodTip">备注</div>
+            <div class="lightTip">{{ dataForm.remark }}</div>
           </el-row>
           <el-row>
             <div class="blodTip">维修附件</div>
@@ -55,20 +72,6 @@
             </div>
             <p v-else>暂无附件</p>
           </el-row>
-          <el-row :gutter="20">
-            <el-col :span="8">
-              <div class="blodTip">创建时间</div>
-              <div class="lightTip">{{ parseTime(dataForm.createTime) }}</div>
-            </el-col>
-            <el-col :span="8">
-              <div class="blodTip">创建人</div>
-              <div class="lightTip">{{ dataForm.creator }}</div>
-            </el-col>
-          </el-row>
-          <el-row>
-            <div class="blodTip">备注</div>
-              <div class="lightTip">{{ dataForm.remark }}</div>
-          </el-row>
         </div>
         <!-- <el-divider style="margin-top: -10px" />
         <small-title style="margin: 16px 0; padding-left: 8px" :no-padding="true">
@@ -143,13 +146,17 @@
           </el-row>
         </el-form> -->
 
-        <div v-if="!disabled" class="drawer-body__footer">
+        <!-- <div v-if="!disabled" class="drawer-body__footer">
           <el-button style="" @click="goback()">取消</el-button>
           <el-button type="primary" @click="dataFormSubmit()">确定</el-button>
-        </div>
+        </div> -->
       </div>
     </div>
-  </el-drawer>
+    <span slot="footer" class="dialog-footer">
+      <el-button @click="visible = false">取 消</el-button>
+    </span>
+  </el-dialog>
+  <!-- </el-drawer> -->
 </template>
 
 <script>
@@ -254,6 +261,9 @@ export default {
   },
   mounted() { },
   methods: {
+    closed() {
+      this.$emit('destroy')
+    },
     setFileName(val) {
       this.fileName = val
     },
@@ -373,7 +383,7 @@ export default {
 .drawer-body__content {
   flex: 1;
   /* background: #eee; */
-  padding: 20px 30px;
+  padding: 5px 10px;
   overflow-y: auto;
 }
 

From 6025c8fbf7b6ede276185fb0acf87ea9dffd566f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Wed, 13 Mar 2024 14:54:35 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.dev                                           |  4 ++--
 src/views/OperationalOverview/coldBoard.vue        | 14 ++++----------
 .../OperationalOverview/components/ISRAChart.vue   |  4 ++--
 .../components/doubleYChart .vue                   | 14 +++++++-------
 .../components/linearBarChart.vue                  | 10 +++++-----
 .../components/pileBarChart.vue                    |  6 +++---
 .../base/qualityHotMaterial/add-or-updata.vue      |  7 ++++---
 src/views/report/productionWeekReport/index.vue    |  4 ++--
 8 files changed, 29 insertions(+), 34 deletions(-)

diff --git a/.env.dev b/.env.dev
index 707df190..e796eafc 100644
--- a/.env.dev
+++ b/.env.dev
@@ -1,7 +1,7 @@
 ###
  # @Author: Do not edit
  # @Date: 2023-08-29 09:40:39
- # @LastEditTime: 2024-03-05 09:48:49
+ # @LastEditTime: 2024-03-13 08:40:35
  # @LastEditors: zhp
  # @Description:
 ###
@@ -25,7 +25,7 @@ VUE_APP_BASE_API = 'http://192.168.0.33:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.78:48082'
 # VUE_APP_BASE_API = 'http://192.168.1.47:48082'
 # socket地址
-VUE_APP_Socket_API = 'ws://192.168.0.30:8888'
+VUE_APP_Socket_API = 'ws://192.168.0.33:48082'
 VUE_APP_Socket_Dcs_API = 'ws://10.70.180.10:8081'
 
 # 积木报表指向地址
diff --git a/src/views/OperationalOverview/coldBoard.vue b/src/views/OperationalOverview/coldBoard.vue
index b041214c..dcea1163 100644
--- a/src/views/OperationalOverview/coldBoard.vue
+++ b/src/views/OperationalOverview/coldBoard.vue
@@ -1,17 +1,11 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 16:50:26
- * @LastEditTime: 2024-02-29 15:48:11
+ * @LastEditTime: 2024-03-13 09:07:37
  * @LastEditors: zhp
  * @Description:
 -->
-<!--
- * @Author: zwq
- * @Date: 2021-07-19 15:18:30
- * @LastEditors: zhp
- * @LastEditTime: 2024-01-29 17:05:37
- * @Description:
--->
+
 <template>
   <div id="container" ref="container" class="visual-container" :style="styles">
     <el-row class="container-title" :style="{
@@ -19,7 +13,7 @@
       lineHeight: 88 + 'px',
       fontSize: 31 + 'px'
     }">
-      <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.4em" alt="">
+      <img src="../../assets/img/logo.png" style="width:1.1em;position:relative;top:.22em" alt="">
       许昌安彩冷端看板
       <h3 class="unit">单位：河南汇融数字科技有限公司</h3>
       <h3 class="time">{{ times }}</h3>
@@ -715,7 +709,7 @@ export default {
           `<span style="color:rgba(255,255,255,0.7)">${this.getSize(item.size) || ''}</span>`,
           `<span style="color:rgba(255,255,255,0.7)">${item.productArea + '㎡' || ''}</span>`,
           `<span style="color:rgba(255,255,255,0.7)">${item.wasteArea + '㎡' || ''}</span>`,
-          `<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:rgba(255,255,255,0.7)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>
+          `<div style = "${(item.product * 100).toFixed(2) > 91 ? 'display:block;color:#00FFF7' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>
            <div style = "${(item.product * 100).toFixed(2) < 91 ? 'display:block; color:rgba(255, 209, 96, 1)' : 'display:none;'}">${(item.product * 100).toFixed(2) + '%' || ''}</div>`
         ])
         this.cutConfig.data = cutArr
diff --git a/src/views/OperationalOverview/components/ISRAChart.vue b/src/views/OperationalOverview/components/ISRAChart.vue
index a42dc068..f5f59018 100644
--- a/src/views/OperationalOverview/components/ISRAChart.vue
+++ b/src/views/OperationalOverview/components/ISRAChart.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-01-29 13:45:56
- * @LastEditTime: 2024-02-18 14:20:01
+ * @LastEditTime: 2024-03-13 08:58:01
  * @LastEditors: zhp
  * @Description:
 -->
@@ -87,7 +87,7 @@ export default {
 				legend: {
 					bottom: '10%',
 					left: 'center',
-					itemWidth: 20,
+					itemWidth: 12,
 					itemHeight:12,
           icon: 'rect',
 					textStyle: {
diff --git a/src/views/OperationalOverview/components/doubleYChart .vue b/src/views/OperationalOverview/components/doubleYChart .vue
index 7d289927..2bff2e31 100644
--- a/src/views/OperationalOverview/components/doubleYChart .vue	
+++ b/src/views/OperationalOverview/components/doubleYChart .vue	
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2024-02-01 15:52:41
+ * @LastEditTime: 2024-03-13 08:51:12
  * @LastEditors: zhp
  * @Description:
 -->
@@ -172,7 +172,7 @@ export default {
           axisLine: {
             lineStyle: {
               type: 'solid',
-              color: '#213259', // 左边线的颜色
+              color: '#25528f',
               width: '1' // 坐标线的宽度
             }
           },
@@ -186,7 +186,7 @@ export default {
           },
           splitLine: {
             lineStyle: {
-              color: '#213259'
+              color: '#25528f'
             }
           },
           data: nameList
@@ -215,7 +215,7 @@ export default {
               show: true,
               lineStyle: {
                 type: 'solid',
-                color: '#213259', // 左边线的颜色
+                color: '#25528f',
                 width: '1' // 坐标线的宽度
               }
             },
@@ -228,7 +228,7 @@ export default {
             },
             splitLine: {
               lineStyle: {
-                color: '#213259'
+                color: '#25528f'
               }
             }
             // type: 'value'
@@ -260,7 +260,7 @@ export default {
               show: true,
               lineStyle: {
                 type: 'solid',
-                color: '#213259', // 左边线的颜色
+                color: '#25528f', // 左边线的颜色
                 width: '1' // 坐标线的宽度
               }
             },
@@ -275,7 +275,7 @@ export default {
             },
             splitLine: {
               lineStyle: {
-                color: '#213259'
+                color: '#25528f'
               }
             }
             // type: 'value'
diff --git a/src/views/OperationalOverview/components/linearBarChart.vue b/src/views/OperationalOverview/components/linearBarChart.vue
index eae6faf0..f166f979 100644
--- a/src/views/OperationalOverview/components/linearBarChart.vue
+++ b/src/views/OperationalOverview/components/linearBarChart.vue
@@ -145,7 +145,7 @@ export default {
           axisLine: {
             lineStyle: {
               type: 'solid',
-              color: '#213259', // 左边线的颜色
+              color: '#25528f', // 左边线的颜色
               width: '1' // 坐标线的宽度
             }
           },
@@ -156,7 +156,7 @@ export default {
           },
           splitLine: {
             lineStyle: {
-              color: '#213259'
+              color: '#25528f'
             }
           },
           data: this.nameList
@@ -172,17 +172,17 @@ export default {
           axisLabel: {
             color: "#fff",
             fontSize: 12,
-            formatter: '{value}/kwh'
+            // formatter: '{value}/kwh'
           },
           axisLine: {
             show: true,
             lineStyle: {
-              color: "#213259",
+              color: "#25528f",
             },
           },
           splitLine: {
             lineStyle: {
-              color: "#213259a0",
+              color: "#25528f",
             },
           }
         },
diff --git a/src/views/OperationalOverview/components/pileBarChart.vue b/src/views/OperationalOverview/components/pileBarChart.vue
index 9d2a06d9..e03ec577 100644
--- a/src/views/OperationalOverview/components/pileBarChart.vue
+++ b/src/views/OperationalOverview/components/pileBarChart.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-27 13:54:52
- * @LastEditTime: 2024-02-21 14:38:54
+ * @LastEditTime: 2024-03-13 09:04:11
  * @LastEditors: zhp
  * @Description:
 -->
@@ -170,8 +170,8 @@ export default {
       // }
       this.chart.setOption({
         legend: {
-          // top: '2.5%',
-          // right: '20px',
+          itemWidth: 12,
+          itemHeight: 12,
           icon: 'rect',
           textStyle: {
             color: '#ffffff'
diff --git a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
index 1a974283..3ef47db4 100644
--- a/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
+++ b/src/views/quality/base/qualityHotMaterial/add-or-updata.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-08 13:46:17
- * @LastEditTime: 2024-03-01 15:22:06
+ * @LastEditTime: 2024-03-12 14:54:05
  * @LastEditors: zhp
  * @Description:
 -->
@@ -58,7 +58,8 @@
           <el-col :span="8">
             <el-form-item label="检测时间" prop="checkTime"
               :rules="[{ required: true, message: '检测时间不能为空', trigger: 'change' }]">
-              <el-date-picker v-model="dataForm.checkTime" type="datetime" placeholder="选择检测时间">
+              <el-date-picker value-format="timestamp" v-model="dataForm.checkTime" type="datetime"
+                placeholder="选择检测时间">
               </el-date-picker>
             </el-form-item>
           </el-col>
@@ -80,7 +81,7 @@
           <el-col :span="8">
             <el-form-item :prop="'checkValueList.' + index + '.checkValue'" label="成分含量"
               :rules="[{ required: true, message: '成分含量不能为空', trigger: 'blur' }]">
-              <el-input  oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
+              <el-input oninput="value=value.replace(/[^\d]/g,'')" :disabled="isdetail"
                 style="width: 90%;margin-right: 10px;" :max="item.maxValue" :min='item.minValue'
                 v-model.number="dataForm.checkValueList[index].checkValue"
                 @change="judgeValue(arguments[0],item.minValue,item.maxValue,index)"></el-input>
diff --git a/src/views/report/productionWeekReport/index.vue b/src/views/report/productionWeekReport/index.vue
index d18f3ee6..faad215a 100644
--- a/src/views/report/productionWeekReport/index.vue
+++ b/src/views/report/productionWeekReport/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2023-12-12 13:45:25
- * @LastEditTime: 2024-03-12 11:14:55
+ * @LastEditTime: 2024-03-13 10:44:26
  * @LastEditors: zhp
  * @Description:
 -->
@@ -10,7 +10,7 @@
     <el-form :inline="true" :model="dataForm" class="demo-form-inline">
       <el-form-item>
         <el-date-picker v-model="reportTime" type="week" size="small" @change="changeTime"
-          :picker-options="{firstDayOfWeek: 5}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
+          :picker-options="{firstDayOfWeek: 4}" :format="'yyyy 第 WW 周' + '\u3000' + startTimeStamp + '-' + endTimeStamp"
           style="width: 350px" placeholder="选择周">
         </el-date-picker>
       </el-form-item>