From 052d0704fdf421c715ef92b7f8ba8f3f29e64941 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Mon, 1 Jul 2024 13:49:30 +0800
Subject: [PATCH 1/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

---
 src/views/copilot/components/Container.vue    | 39 +++++------------
 .../copilot/components/leftContainer.vue      | 43 ++++++-------------
 .../copilot/components/rightContainer.vue     | 43 ++++++-------------
 src/views/copilot/components/twoContainer.vue |  2 +-
 src/views/copilot/efficiency/index.vue        |  6 +--
 .../copilot/efficiency/options/chipOptions.js |  4 +-
 .../factoryData/components/leftContainer.vue  | 43 ++++++-------------
 .../factoryData/components/rightContainer.vue |  2 +-
 src/views/report/produceConversion.vue        |  6 +--
 9 files changed, 56 insertions(+), 132 deletions(-)

diff --git a/src/views/copilot/components/Container.vue b/src/views/copilot/components/Container.vue
index cfeb685..bae27da 100644
--- a/src/views/copilot/components/Container.vue
+++ b/src/views/copilot/components/Container.vue
@@ -8,9 +8,7 @@
 <template>
   <div class="copilot-container">
     <!-- refresh btn  -->
-    <button
-      v-if="0"
-      style="
+    <button v-if="0" style="
         appearance: none;
         outline: none;
         border: none;
@@ -20,22 +18,11 @@
         position: absolute;
         top: 8px;
         right: 8px;
-      "
-      @click="$emit('refresh')"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        fill="none"
-        viewBox="0 0 24 24"
-        stroke-width="1.5"
-        stroke="currentColor"
-        style="width: 24px; height: 24px"
-      >
-        <path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
-        />
+      " @click="$emit('refresh')">
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+        style="width: 24px; height: 24px">
+        <path stroke-linecap="round" stroke-linejoin="round"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
       </svg>
     </button>
     <!-- decoration  -->
@@ -44,19 +31,13 @@
     <div v-if="side == 'left'" class="corner bl"></div>
     <div v-if="side == 'right'" class="corner br"></div>
     <!-- content  -->
-    <div
-      class="container-head"
-      :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
-    >
-      <Icon :icon="icon"></Icon>
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
     </div>
-    <div
-      class="container-body"
-      :class="[
+    <div class="container-body" :class="[
         side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
-      ]"
-    >
+      ]">
       <slot />
     </div>
   </div>
diff --git a/src/views/copilot/components/leftContainer.vue b/src/views/copilot/components/leftContainer.vue
index a17f62e..b6f723c 100644
--- a/src/views/copilot/components/leftContainer.vue
+++ b/src/views/copilot/components/leftContainer.vue
@@ -8,9 +8,7 @@
 <template>
   <div class="copilot-container">
     <!-- refresh btn  -->
-    <button
-      v-if="false"
-      style="
+    <button v-if="false" style="
         appearance: none;
         outline: none;
         border: none;
@@ -20,43 +18,26 @@
         position: absolute;
         top: 8px;
         right: 8px;
-      "
-      @click="$emit('refresh')"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        fill="none"
-        viewBox="0 0 24 24"
-        stroke-width="1.5"
-        stroke="currentColor"
-        style="width: 24px; height: 24px"
-      >
-        <path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
-        />
+      " @click="$emit('refresh')">
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+        style="width: 24px; height: 24px">
+        <path stroke-linecap="round" stroke-linejoin="round"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
       </svg>
     </button>
     <!-- decoration  -->
     <div class="corner tl"></div>
     <div class="corner tr"></div>
-    <div  class="corner bl"></div>
-    <div  class="corner br"></div>
+    <div class="corner bl"></div>
+    <div class="corner br"></div>
     <!-- content  -->
-    <div
-      class="container-head"
-      :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
-    >
-      <Icon :icon="icon"></Icon>
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
     </div>
-    <div
-      class="container-body"
-      :class="[
+    <div class="container-body" :class="[
         side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
-      ]"
-    >
+      ]">
       <slot />
     </div>
   </div>
diff --git a/src/views/copilot/components/rightContainer.vue b/src/views/copilot/components/rightContainer.vue
index 124bcee..561101a 100644
--- a/src/views/copilot/components/rightContainer.vue
+++ b/src/views/copilot/components/rightContainer.vue
@@ -8,9 +8,7 @@
 <template>
   <div class="copilot-container">
     <!-- refresh btn  -->
-    <button
-      v-if="false"
-      style="
+    <button v-if="false" style="
         appearance: none;
         outline: none;
         border: none;
@@ -20,43 +18,26 @@
         position: absolute;
         top: 8px;
         right: 8px;
-      "
-      @click="$emit('refresh')"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        fill="none"
-        viewBox="0 0 24 24"
-        stroke-width="1.5"
-        stroke="currentColor"
-        style="width: 24px; height: 24px"
-      >
-        <path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
-        />
+      " @click="$emit('refresh')">
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+        style="width: 24px; height: 24px">
+        <path stroke-linecap="round" stroke-linejoin="round"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
       </svg>
     </button>
     <!-- decoration  -->
     <div class="corner tl"></div>
     <div class="corner tr"></div>
-    <div  class="corner bl"></div>
-    <div  class="corner br"></div>
+    <div class="corner bl"></div>
+    <div class="corner br"></div>
     <!-- content  -->
-    <div
-      class="container-head"
-      :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
-    >
-      <Icon :icon="icon"></Icon>
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
     </div>
-    <div
-      class="container-body"
-      :class="[
+    <div class="container-body" :class="[
         side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
-      ]"
-    >
+      ]">
       <slot />
     </div>
   </div>
diff --git a/src/views/copilot/components/twoContainer.vue b/src/views/copilot/components/twoContainer.vue
index 4898728..1b9e764 100644
--- a/src/views/copilot/components/twoContainer.vue
+++ b/src/views/copilot/components/twoContainer.vue
@@ -55,7 +55,7 @@
       class="container-head"
       :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
     >
-      <Icon :icon="icon"></Icon>
+      <Icon  :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
     </div>
     <div
diff --git a/src/views/copilot/efficiency/index.vue b/src/views/copilot/efficiency/index.vue
index 04fc995..ac910ef 100644
--- a/src/views/copilot/efficiency/index.vue
+++ b/src/views/copilot/efficiency/index.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:04:53
- * @LastEditTime: 2024-06-05 09:45:47
+ * @LastEditTime: 2024-07-01 12:27:45
  * @LastEditors: zhp
  * @Description:
 -->
@@ -102,12 +102,12 @@ export default {
   flex: 1;
   display: flex;
   flex-direction: column;
-  gap: 16px;
+  gap: 20px;
 }
 
 .flex {
   display: flex;
-  gap: 16px;
+  gap: 20px;
   flex: 1;
 }
 
diff --git a/src/views/copilot/efficiency/options/chipOptions.js b/src/views/copilot/efficiency/options/chipOptions.js
index 59af0e2..5642da1 100644
--- a/src/views/copilot/efficiency/options/chipOptions.js
+++ b/src/views/copilot/efficiency/options/chipOptions.js
@@ -23,12 +23,12 @@ export default ({
     textAlign: "center",
     textStyle: {
       fontWeight: 600,
-      fontSize: 26,
+      fontSize: 36,
       color: "#fffd",
     },
     subtext: `\u2002${yesterday + '日良率'}\u2002`,
     subtextStyle: {
-      fontSize: 14,
+      fontSize: 16,
       fontWeight: 100,
       color: "#fffd",
       align: "right",
diff --git a/src/views/copilot/factoryData/components/leftContainer.vue b/src/views/copilot/factoryData/components/leftContainer.vue
index 7c938e8..2bec662 100644
--- a/src/views/copilot/factoryData/components/leftContainer.vue
+++ b/src/views/copilot/factoryData/components/leftContainer.vue
@@ -15,9 +15,7 @@
 <template>
   <div class="copilot-container">
     <!-- refresh btn  -->
-    <button
-      v-if="false"
-      style="
+    <button v-if="false" style="
         appearance: none;
         outline: none;
         border: none;
@@ -27,43 +25,26 @@
         position: absolute;
         top: 8px;
         right: 8px;
-      "
-      @click="$emit('refresh')"
-    >
-      <svg
-        xmlns="http://www.w3.org/2000/svg"
-        fill="none"
-        viewBox="0 0 24 24"
-        stroke-width="1.5"
-        stroke="currentColor"
-        style="width: 24px; height: 24px"
-      >
-        <path
-          stroke-linecap="round"
-          stroke-linejoin="round"
-          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99"
-        />
+      " @click="$emit('refresh')">
+      <svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 24 24" stroke-width="1.5" stroke="currentColor"
+        style="width: 24px; height: 24px">
+        <path stroke-linecap="round" stroke-linejoin="round"
+          d="M16.023 9.348h4.992v-.001M2.985 19.644v-4.992m0 0h4.992m-4.993 0 3.181 3.183a8.25 8.25 0 0 0 13.803-3.7M4.031 9.865a8.25 8.25 0 0 1 13.803-3.7l3.181 3.182m0-4.991v4.99" />
       </svg>
     </button>
     <!-- decoration  -->
     <div class="corner tl"></div>
     <div class="corner tr"></div>
-    <div  class="corner bl"></div>
-    <div  class="corner br"></div>
+    <div class="corner bl"></div>
+    <div class="corner br"></div>
     <!-- content  -->
-    <div
-      class="container-head"
-      :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']"
-    >
-      <Icon :icon="icon"></Icon>
+    <div class="container-head" :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
+      <Icon style="margin-left: 16px;" :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
     </div>
-    <div
-      class="container-body"
-      :class="[
+    <div class="container-body" :class="[
         side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
-      ]"
-    >
+      ]">
       <slot />
     </div>
   </div>
diff --git a/src/views/copilot/factoryData/components/rightContainer.vue b/src/views/copilot/factoryData/components/rightContainer.vue
index 797546e..3d8db3d 100644
--- a/src/views/copilot/factoryData/components/rightContainer.vue
+++ b/src/views/copilot/factoryData/components/rightContainer.vue
@@ -33,7 +33,7 @@
     <!-- content  -->
     <div class="container-head" ref="container-head"
       :class="[side == 'left' ? 'gradient-to-right' : 'gradient-to-left']">
-      <Icon :icon="icon"></Icon>
+      <Icon  :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
       <div class="button-than" style="margin-left: auto;">
         <CopilotButton v-for="i in ['同比', '环比']" :key="i" :label="i" :active="i === than"
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 22de025..189f7b6 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -571,10 +571,10 @@ export default {
         })
       })
       if (res.data[0].list.length != 0) {
-        this.chartMsg.xData.push(res.data[0].list[res.data[0].list.length - 1].reportTimep + '年目标')
+        this.chartMsg.xData.push(res.data[0].list[res.data[0].list.length - 1].reportTimep + '目标')
         if (this.listQuery.date === 0 || this.listQuery.date === 1 || this.listQuery.date === 2) {
           this.otherProps.push({
-            label: res.data[0].list[res.data[0].list.length - 1].reportTimep + '年目标',
+            label: res.data[0].list[res.data[0].list.length - 1].reportTimep + '目标',
             prop: 'dayData'
           })
           dataArr[0]['dayData'] = res.data[0].list[res.data[0].list.length - 1].chipTarget
@@ -583,7 +583,7 @@ export default {
         }
         if (this.listQuery.date === 2 || this.listQuery.date === 3) {
           this.otherProps.push({
-            label: res.data[0].yearTarget.targetTime,
+            label: res.data[0].yearTarget.targetTime + '年目标',
             prop: 'yearData'
           })
           dataArr[0]['yearData'] = res.data[0].yearTarget.chipTotalPower

From a249e88530da062979ea7c363a29c0909004b7bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=98937886381=E2=80=99?= <‘937886381@qq.com’>
Date: Mon, 1 Jul 2024 14:40:09 +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

---
 src/views/report/comprehensiveData.vue          | 8 ++++----
 src/views/report/produceConversion.vue          | 8 ++++----
 src/views/report/productionSituationMW.vue      | 6 +++---
 src/views/report/productionSituationTablets.vue | 6 +++---
 src/views/report/productionYield.vue            | 6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/report/comprehensiveData.vue b/src/views/report/comprehensiveData.vue
index eb92bb0..a15571d 100644
--- a/src/views/report/comprehensiveData.vue
+++ b/src/views/report/comprehensiveData.vue
@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-01 11:49:38
+ * @LastEditTime: 2024-07-01 14:39:18
  * @LastEditors: zhp
  * @Description:
 -->
@@ -326,12 +326,12 @@ export default {
       }
     },
     async getDataList() {
+      if (this.listQuery.type == null) {
+        return this.$message('请选择时间维度')
+      }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
         return this.$message('请选择起止时间')
       }
-      if (!this.listQuery.type) {
-        return this.$message('请选择时间维度')
-      }
       this.otherProps = []
       let arr  = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
diff --git a/src/views/report/produceConversion.vue b/src/views/report/produceConversion.vue
index 189f7b6..0755eda 100644
--- a/src/views/report/produceConversion.vue
+++ b/src/views/report/produceConversion.vue
@@ -402,7 +402,7 @@ export default {
     this.getDataList()
   },
   methods: {
-    handleChange() {
+    handleChange(val) {
       this.listQuery.reportTime = []
       this.listQuery.end = null
       this.listQuery.start = null
@@ -529,12 +529,12 @@ export default {
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
       this.title = ''
+      if (this.listQuery.date == null) {
+        return this.$message('请选择时间维度')
+      }
       if (!this.listQuery.beginTime && !this.listQuery.endTime) {
         return this.$message('请选择起止时间')
       }
-      if (!this.listQuery.date) {
-        return this.$message('请选择时间维度')
-      }
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
         this.listQuery.beginTime = this.listQuery.reportTime[0]
diff --git a/src/views/report/productionSituationMW.vue b/src/views/report/productionSituationMW.vue
index 6fafa40..41be8ad 100644
--- a/src/views/report/productionSituationMW.vue
+++ b/src/views/report/productionSituationMW.vue
@@ -500,12 +500,12 @@ export default {
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
       console.log(this.listQuery);
+      if (this.listQuery.type == null) {
+        return this.$message('请选择时间维度')
+      }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
         return this.$message('请选择起止时间')
       }
-      if (!this.listQuery.type) {
-        return this.$message('请选择时间维度')
-      }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
diff --git a/src/views/report/productionSituationTablets.vue b/src/views/report/productionSituationTablets.vue
index 0e8432c..2a9487b 100644
--- a/src/views/report/productionSituationTablets.vue
+++ b/src/views/report/productionSituationTablets.vue
@@ -632,12 +632,12 @@ export default {
         this.chartMsgYearTarget.series[3].data = []
       }
       // console.log(this.listQuery);
+      if (this.listQuery.type == null) {
+        return this.$message('请选择时间维度')
+      }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
         return this.$message('请选择起止时间')
       }
-      if (!this.listQuery.type) {
-        return this.$message('请选择时间维度')
-      }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr
diff --git a/src/views/report/productionYield.vue b/src/views/report/productionYield.vue
index e2dc078..472c64f 100644
--- a/src/views/report/productionYield.vue
+++ b/src/views/report/productionYield.vue
@@ -551,12 +551,12 @@ export default {
       this.chartMsgYearTarget.xData = []
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
+      if (this.listQuery.type == null) {
+        return this.$message('请选择时间维度')
+      }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
         return this.$message('请选择起止时间')
       }
-      if (!this.listQuery.type) {
-        return this.$message('请选择时间维度')
-      }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
       this.listQuery.factory = arr