修改bug

2024-01-09 16:25:12 +08:00
parent 0a1bc65e79
commit f066180c26
13 changed files with 165 additions and 73 deletions
--- a/src/views/OperationalOverview/components/baseContainer/index.vue
+++ b/src/views/OperationalOverview/components/baseContainer/index.vue
@@ -2,13 +2,13 @@
 * @Author: gtz
 * @Date: 2022-01-19 15:58:17
 * @LastEditors: zhp
- * @LastEditTime: 2024-01-04 16:16:22
+ * @LastEditTime: 2024-01-08 16:03:05
 * @Description: file content
 * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseContainer\index.vue
 -->
 <template>
  <div class="base-container" ref="baseContainer" :style="{ height: '100%', fontSize: 12 + 'px', padding: 12 + 'px' }"
-    :class="{ 'no-padding': noPadding, 'border-none': !showLine }">
+    :class="[{ 'no-padding': noPadding, 'border-none': !showLine }, 'base-container__' + size]">
    <!-- <div class="base-container" :style="{height: height + 'px', fontSize: 12 + 'px', padding: 12 + 'px'}"> -->
    <template v-if="showLine">
      <div class="line" />
@@ -74,6 +74,10 @@ export default {
    beilv: {
      type: Number,
      default: 1
+    },
+    size: {
+      type: String,
+      default: ''
    }
  },
  data() {
@@ -106,8 +110,25 @@ export default {
  // background-color: rgba($color: #061027, $alpha: 0.15);
  position: relative;
  // border: 2px solid;
-    background: url('../../../../assets/img/energy.png') no-repeat;
-    background-size: 100% 100%;
+    // background: url('../../../../assets/img/energy.png') no-repeat;
+    // background-size: 100% 100%;
+      &__small {
+          background: url(../../../../assets/img/short.png) no-repeat;
+          background-size: 100% 100%;
+          // background-position: 0 0;
+        }
+
+        &__middle {
+          background: url(../../../../assets/img/middle.png) no-repeat;
+          background-size: 100% 100%;
+          // background-position: 0 0;
+        }
+
+        &__large {
+          background: url(../../../../assets/img/high.png) no-repeat;
+          background-size: 100% 100%;
+          // background-position: 0 0;
+        }
  //   border-radius: 40px 0px 40px 0px;
  // border-image: linear-gradient(360deg, rgba(157, 246, 254, 0.05), rgba(100, 233, 252, 0.9)) 2 2;
  // .line {
@@ -170,8 +191,8 @@ export default {

  .bar-title {
    width: 100%;
-    color: #52fff1;
-    font-size: 1.5em;
+    color: #ffffff;
+    font-size: 1.6em;
    padding: 0.67em;
  }

--- a/src/views/OperationalOverview/components/baseTable.vue
+++ b/src/views/OperationalOverview/components/baseTable.vue
@@ -1,26 +1,23 @@
 <!--
 * @Date: 2020-12-14 09:07:03
 * @LastEditors: zhp
- * @LastEditTime: 2024-01-04 16:16:00
+ * @LastEditTime: 2024-01-08 14:09:05
 * @FilePath: \mt-bus-fe\src\views\OperationalOverview\components\baseTable.vue
 * @Description:
 -->
 <template>
-
  <div class="visual-base-table-container scroll_table">
    <div style="display: inline-block; width: 100%">
      <el-table class="top" v-loading="isLoading"
-        :header-cell-style="{background:'rgba(4, 74, 132, .19)',color:'#fff',}" :row-style="setRowStyle"
-        :data="renderData" border style="width: 100%; background: transparent">
+        :header-cell-style="{ background: 'rgba(32, 55, 96, 1)', color: '#fff', height: '33px', }"
+        :row-style="setRowStyle" :data="renderData" border style="width: 100%; background: transparent">
        <el-table-column prop="_pageIndex" label="序号" :width="50" align="center" />
        <el-table-column v-for="item in renderTableHeadList" :key="item.prop" :show-overflow-tooltip="showOverflow"
          v-bind="item">
          <template slot-scope="scope">
-
            <component :is="item.subcomponent" v-if="item.subcomponent" :inject-data="{...scope.row, ...item}"
              @emitData="emitData" />
            <span v-else>{{ scope.row[item.prop] | commonFilter(item.filter) }}</span>
-
          </template>
        </el-table-column>
        <slot name="content" />
@@ -33,11 +30,9 @@
          <el-table-column v-for="item in renderTableHeadList" :key="item.prop" :show-overflow-tooltip="showOverflow"
            v-bind="item">
            <template slot-scope="scope">
-
              <component :is="item.subcomponent" v-if="item.subcomponent" :inject-data="{...scope.row, ...item}"
                @emitData="emitData" />
              <span v-else>{{ scope.row[item.prop] | commonFilter(item.filter) }}</span>
-
            </template>
          </el-table-column>
          <slot name="content" />
@@ -45,7 +40,6 @@
      </vue-seamless-scroll>
    </div>
  </div>
-
 </template>
 <script>
 import { isObject, isString } from 'lodash'
--- a/src/views/OperationalOverview/components/colorDiv.vue
+++ b/src/views/OperationalOverview/components/colorDiv.vue
@@ -0,0 +1,44 @@
+<!--
+ * @Date: 2021-02-20 10:45:21
+ * @LastEditors: zhp
+ * @LastEditTime: 2024-01-09 16:16:43
+ * @FilePath: \basic-admin\src\views\EquipmentManager\TypeParamSetting\ColorSqua.vue
+ * @Description:
+-->
+<template>
+  <span :class="[injectData.product <= 91 ? 'orange' : 'white']" >
+    {{ injectData.product + "%" }}
+  </span>
+</template>
+
+<script>
+export default {
+  props: {
+    injectData: {
+      type: Object,
+      default: () => ({})
+    }
+  },
+  data() {
+    return {
+      color: 'rgba(255,255,255,0.5)',
+    }
+  },
+  mounted() {
+    this.product = this.injectData.product
+  },
+  methods: {
+    emitClick() {
+      console.log(this.injectData)
+    }
+  }
+}
+</script>
+<style  scoped>
+.orange{
+  color:rgba(255, 209, 96, 1)
+}
+.white{
+  color:rgba(255, 255, 255, 0.5)
+}
+</style>
--- a/src/views/OperationalOverview/components/doubleYChart
+++ b/src/views/OperationalOverview/components/doubleYChart
@@ -1,7 +1,7 @@
 <!--
 * @Author: zhp
 * @Date: 2023-09-21 09:06:28
- * @LastEditTime: 2023-12-29 16:18:17
+ * @LastEditTime: 2024-01-09 14:42:02
 * @LastEditors: zhp
 * @Description:
 -->
@@ -88,11 +88,21 @@ export default {
          name: '产线产量',
          type: 'bar',
          yAxisIndex: 1,
-          itemStyle: {
-            color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
-              { offset: 0, color: '#9DD5FF' },
-              { offset: 1, color: '#1295FF' }
-            ])
+         itemStyle: {
+           normal: {
+             color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
+               { offset: 0, color: '#9DD5FF' },
+               { offset: 0.3, color: '#1295FF' }
+             ]),
+             label: {
+               show: true,		//开启显示
+               position: 'top',	//在上方显示
+               textStyle: {	    //数值样式
+                 color: '#ced1d5',
+                 fontSize: 12
+               }
+             },
+            }
            // barBorderRadius: this.borderRadius
          },
          barWidth: 12,
@@ -100,6 +110,7 @@ export default {
        },
        {
          name: '产线良品率',
+          symbol: 'circle', //变为实心圆
          type: 'line',
          yAxisIndex: 0,
          areaStyle: {
@@ -126,10 +137,10 @@ export default {
          data: passRateList
        }
      ]
-      const colors = ['#5470C6', '#91CC75', '#EE6666']
+      // const colors = ['#5470C6', '#91CC75', '#EE6666']
      this.chart = echarts.init(document.getElementById(this.id))
      this.chart.setOption({
-        color: colors,
+        // color: colors,
        tooltip: {
          trigger: 'axis',
          axisPointer: {
@@ -137,8 +148,8 @@ export default {
          }
        },
        grid: {
-          left: "4%",
-          right: "4%",
+          left: "3%",
+          right: "5%",
          bottom: "3%",
          width: 'auto',
          height: "auto",
@@ -187,11 +198,13 @@ export default {
            type: 'value',
            name: '良品率/%',
            nameTextStyle: {// y轴上方单位的颜色
-              color: '#fff'
+              color: '#fff',
+              align: "left",
            },
            position: 'right',
            alignTicks: true,
            axisLine: {
+              show: true,
              lineStyle: {
                type: 'solid',
                color: '#213259', // 左边线的颜色
@@ -227,12 +240,15 @@ export default {
            scale: true,
            type: 'value',
            name: '产量/㎡', // y轴上方的单位
-            nameTextStyle: {// y轴上方单位的颜色
-              color: '#fff'
+            nameTextStyle: {
+              color: "#fff",
+              // fontSize: 10,
+              align: "right",
            },
            position: 'left',
            alignTicks: true,
            axisLine: {
+              show: true,
              lineStyle: {
                type: 'solid',
                color: '#213259', // 左边线的颜色
--- a/src/views/OperationalOverview/components/linearBarChart.vue
+++ b/src/views/OperationalOverview/components/linearBarChart.vue
@@ -142,6 +142,7 @@ export default {
            }
          },
          axisLabel: {
+            show: true,    // 是否显示 y 轴
            textStyle: {
              color: 'rgba(255,255,255,0.5)' // 坐标值得具体的颜色
            }