Merge pull request 'projects/mescc/zhp' (#78) from projects/mescc/zhp into projects/mescc/develop

Reviewed-on: #78
2024-07-01 14:58:13 +08:00
parent 749b9c6576 a249e88530
commit 81a110ba45
13 changed files with 73 additions and 149 deletions
--- 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>
--- 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>
--- 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>
--- 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
--- 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;
 }

--- 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",
--- 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>
--- 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"
--- 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)
--- 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]
@@ -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
--- 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
--- 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
--- 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