生产数据echarts图重写

Reviewed-on: #98

src/assets/icons/svg/darkHome.svg

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="24px" height="24px" viewBox="0 0 24 24" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <title>编组</title>
+    <g id="01数字驾驶舱" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
+        <g id="产量驾驶舱" transform="translate(-1438.000000, -12.000000)" fill="#FFFFFF" fill-rule="nonzero">
+            <g id="编组-20" transform="translate(1438.000000, 8.000000)">
+                <g id="编组" transform="translate(0.000000, 4.000000)">
+                    <rect id="矩形" opacity="0" x="0" y="0" width="24" height="24"></rect>
+                    <path d="M11.1710783,2.42919989 C11.7298936,2.09409047 12.4328291,2.12455473 12.9654367,2.52059014 L20.3218013,7.99000647 L20.4665209,8.10559268 C21.0744501,8.62656431 21.4302636,9.40344805 21.4302636,10.227099 L21.4302636,19.0470569 L21.4250327,19.2212289 C21.3382831,20.6611171 20.1833875,21.8011882 18.7715031,21.8011882 L5.2284969,21.8011882 L5.06035624,21.7957697 C3.67032883,21.7059084 2.56973638,20.5095861 2.56973638,19.0470569 L2.56973638,10.2273587 L2.57600507,10.0381789 C2.63012926,9.22282649 3.03207443,8.47038558 3.67819781,7.99000711 L11.034559,2.52059336 Z M12.0713092,3.55793652 C11.9772762,3.53774358 11.8769764,3.55793433 11.7954857,3.6185066 L4.43911542,9.0879271 L4.32641124,9.18150853 C4.04059293,9.44596068 3.87451485,9.82573182 3.87451485,10.2273587 L3.87451485,19.0470569 L3.880713,19.1821318 C3.94632222,19.8933667 4.52470053,20.4496068 5.2284969,20.4496068 L11.2507497,20.4487759 L11.3507364,20.3451977 L11.3512202,14.4627186 L11.3582338,14.3683764 C11.4044406,14.0603828 11.6734228,13.8227675 12,13.8227675 C12.3345637,13.8227675 12.6123182,14.0734451 12.6454705,14.3976012 L12.6489183,14.4681588 L12.6487364,20.3451881 L12.7487231,20.4487759 L18.7714898,20.4496068 L18.9018895,20.4431864 C19.5885066,20.3752237 20.1254851,19.7760987 20.1254851,19.0470569 L20.1254851,10.2273587 L20.1177907,10.0779557 C20.0769951,9.68325297 19.8759128,9.32208831 19.5608746,9.08791971 L12.2045243,3.61851399 L12.1402672,3.58065321 Z" id="形状结合" stroke="#FFFFFF" stroke-width="0.1"></path>
+                </g>
+            </g>
+        </g>
+    </g>
+</svg>

src/components/Breadcrumb/index.vue

@@ -1,11 +1,13 @@
 <template>
   <el-breadcrumb class="app-breadcrumb" separator="/">
     <transition-group name="breadcrumb">
-      <el-breadcrumb-item v-for="(item, index) in levelList" :key="item.path">
+      <el-breadcrumb-item v-for=" (item, index) in levelList" :key="item.path">
-        <span v-if="item.redirect === 'noRedirect' || index === levelList.length - 1" class="no-redirect">{{
+        <span :style="{ color: (changeColor == true ? 'rgba(255, 255, 255, 0.45)' :' rgba(0, 0, 0, .65)')}"
+          v-if="item.redirect === 'noRedirect' || index === levelList.length - 1" class="no-redirect">{{
           item.meta.title
           }}</span>
-        <a v-else @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
+        <a :style="{ color: (changeColor == true ? 'rgba(255, 255, 255, 0.45)' :' rgba(0, 0, 0, .45)')}" v-else
+          @click.prevent="handleLink(item)">{{ item.meta.title }}</a>
       </el-breadcrumb-item>
     </transition-group>
   </el-breadcrumb>
@@ -18,7 +20,29 @@ export default {
       levelList: null
     }
   },
+  computed: {
+    changeColor() {
+      // console.log(this.$route);
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    }
+  },
   watch: {
+    changeColor(val) {
+      if (val == true) {
+        let item = document.getElementsByClassName('el-breadcrumb__separator')
+        // let item  =document.getElementsByClassName('')
+        item[0].style.color = rgba(255, 255, 255, 0.45)
+        item[1].style.color = rgba(255, 255, 255, 0.45)
+      } else {
+        let item = document.getElementsByClassName('el-breadcrumb__separator')
+        item[0].style.color = ''
+          item[1].style.color = ''
+      }
+    },
     $route(route) {
       // if you go to the redirect page, do not update the breadcrumbs
       if (route.path.startsWith('/redirect/')) {
@@ -70,13 +94,20 @@ export default {
   margin-left: 8px;
 
   .no-redirect {
-    color: rgba(0, 0, 0, 0.65);
+    color: rgba(0, 0, 0, .45);
     cursor: text;
   }
 }
-
 .app-breadcrumb .el-breadcrumb__inner a,
 .el-breadcrumb__inner.is-link {
-  color: rgba(0, 0, 0, 0.45);
+  color:rgba(0, 0, 0, 0.65)
 }
 </style>
+<!-- <style lang="scss">
+.changeColor {
+  --theme-color: rgba(255, 255, 255, 0.45);
+}
+.el-breadcrumb__separator {
+  color:var(--theme-color);
+}
+</style> -->

src/components/Hamburger/index.vue

@@ -1,14 +1,16 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-03 15:38:31
+ * @LastEditTime: 2024-07-11 13:56:19
+ * @LastEditors: zhp
+ * @Description:
+-->
 <template>
   <div style="padding: 0 15px;" @click="toggleClick">
-    <svg
+    <svg :class="{'is-active':isActive}" class="hamburger" viewBox="0 0 1024 1024" xmlns="http://www.w3.org/2000/svg"
-      :class="{'is-active':isActive}"
+      width="64" height="64" :fill="changeColor === true ? 'rgba(255, 255, 255, 1)' : '' ">
-      class="hamburger"
+      <path
-      viewBox="0 0 1024 1024"
+        d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
-      xmlns="http://www.w3.org/2000/svg"
-      width="64"
-      height="64"
-    >
-      <path d="M408 442h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8zm-8 204c0 4.4 3.6 8 8 8h480c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8H408c-4.4 0-8 3.6-8 8v56zm504-486H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zm0 632H120c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h784c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8zM142.4 642.1L298.7 519a8.84 8.84 0 0 0 0-13.9L142.4 381.9c-5.8-4.6-14.4-.5-14.4 6.9v246.3a8.9 8.9 0 0 0 14.4 7z" />
     </svg>
   </div>
 </template>
@@ -22,6 +24,15 @@ export default {
       default: false
     }
   },
+  computed: {
+    changeColor() {
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    },
+  },
   methods: {
     toggleClick() {
       this.$emit('toggleClick')

src/layout/components/Navbar.vue

@@ -1,5 +1,6 @@
 <template>
-  <div class="navbar">
+  <div ref="navbar" class="navbar"
+    :style="changeColor ? 'background: rgba(0, 21, 41, 1);boxShadow:0px 1px 8px 0px rgba(0,131,255,0.35)' : ''">
     <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
       @toggleClick="toggleSideBar" />
 
@@ -41,6 +42,13 @@ export default {
       'nickname',
       'device'
     ]),
+    changeColor() {
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    },
     setting: {
       get() {
         return this.$store.state.settings.showSettings
@@ -58,6 +66,23 @@ export default {
       }
     }
   },
+  watch: {
+    // changeColor: {
+    //   handler(val){
+    //     if (val == true) {
+    //       let svg = document.getElementsByClassName('hamburger')
+    //       console.log('svg', svg)
+    //       svg[0].style.color = 'rgba(255, 255, 255, 1)'
+    //       svg[0].setAttribute('fill', 'rgba(255, 255, 255, 1)')
+    //     } else {
+    //       let svg = document.getElementsByClassName('hamburger')
+    //       console.log('svg', svg);
+    //       svg[0].setAttribute('fill', '')
+    //     }
+    //   },
+    //   immediate: true, //立即执行
+    // }
+  },
   methods: {
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')

src/layout/components/NavbarRight.vue

@@ -1,25 +1,31 @@
 <template>
   <div class="right-msg" :style="blackTitle ? 'color: #000' : 'color: #fff'">
     <div class="home-icon" v-if='blackTitle'>
-      <svg-icon icon-class="home" style="font-size: 24px; cursor: pointer;" @click="toHome" />
+      <svg-icon :icon-class="changeColor === true ? 'darkHome' : 'home'"
+        style="font-size: 24px; cursor: pointer;color: aqua;" @click="toHome" />
     </div>
     <div class="time-msg">
-      <div class="line1">{{ timeZone }}&nbsp;&nbsp;&nbsp;&nbsp;{{ topTime }}</div>
+      <div class="line1" :style="changeColor === true ? 'color:rgba(255, 255, 255, 1)' : ''">{{ timeZone
-      <div class="line2">{{ topDate }}</div>
+        }}&nbsp;&nbsp;&nbsp;&nbsp;{{ topTime }}</div>
+      <div :style="changeColor === true ? 'color:rgba(255, 255, 255, .65)' : ''" class="line2">{{ topDate }}</div>
     </div>
     <div class="base-msg">
       <div class="avatar">
         <el-dropdown>
           <img :src="require(`../../assets/images/choicepart/avatar.png`)" alt="" width="32" height="32" />
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item><svg-icon icon-class="helpbtn" />帮助文档</el-dropdown-item>
+            <el-dropdown-item>
-            <el-dropdown-item @click.native="logout"><svg-icon icon-class="exitbtn" />退出登录</el-dropdown-item>
+              <svg-icon icon-class="helpbtn" />帮助文档
+            </el-dropdown-item>
+            <el-dropdown-item @click.native="logout">
+              <svg-icon icon-class="exitbtn" />退出登录
+            </el-dropdown-item>
           </el-dropdown-menu>
         </el-dropdown>
       </div>
       <div class="use-msg">
-        <div class="line1">{{ nickname }}</div>
+        <div :style="changeColor === true ? 'color:rgba(255, 255, 255, 1)' : ''" class="line1">{{ nickname }}</div>
-        <div class="line2">{{ dept }}</div>
+        <div :style="changeColor === true ? 'color:rgba(255, 255, 255, .65)' : ''" class="line2">{{ dept }}</div>
       </div>
     </div>
   </div>
@@ -48,6 +54,15 @@ export default {
       }
     }
   },
+  computed: {
+    changeColor() {
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    },
+  },
   created() {
     // this.getUserMsg()
     this.getTime()

src/layout/components/TagsView/ScrollPane.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-03 15:38:31
+ * @LastEditTime: 2024-07-04 10:44:35
+ * @LastEditors: zhp
+ * @Description:
+-->
 <template>
   <el-scrollbar ref="scrollContainer" :vertical="false" class="scroll-container" @wheel.native.prevent="handleScroll">
     <slot />
@@ -17,7 +24,9 @@ export default {
   computed: {
     scrollWrapper() {
       return this.$refs.scrollContainer.$refs.wrap
-    }
+    },
+  },
+  watch: {
   },
   mounted() {
     this.scrollWrapper.addEventListener('scroll', this.emitScroll, true)

src/layout/components/TagsView/index.vue

@@ -1,5 +1,7 @@
 <template>
-  <div id="tags-view-container" class="tags-view-container">
+  <div ref="tagsViewContainer"
+    :style="changeColor === true ? 'background:rgba(0, 21, 41, 1);borderTop:0px solid #d8dce5' : ''" id="tags-view-container"
+    class="tags-view-container">
     <scroll-pane ref="scrollPane" class="tags-view-wrapper" @scroll="handleScroll">
       <router-link v-for="tag in visitedViews" ref="tag" :key="tag.path" :class="isActive(tag) ? 'active' : ''"
         :to="{ path: tag.path, query: tag.query, fullPath: tag.fullPath }" tag="span" class="tags-view-item"
@@ -36,6 +38,13 @@ export default {
     }
   },
   computed: {
+    changeColor() {
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    },
     visitedViews() {
       return this.$store.state.tagsView.visitedViews
     },
@@ -44,9 +53,31 @@ export default {
     },
     theme() {
       return this.$store.state.settings.theme;
-    }
+    },
   },
   watch: {
+    changeColor(val) {
+      if (val == true) {
+        // console.log('this.$refs.tagsViewContainer', this.$refs.tagsViewContainer);
+        // this.$refs.tagsViewContainer.style.backgroundColor = 'rgba(0, 21, 41, 1)'
+        // this.$refs.tagsViewContainer.style.borderTop = '0px solid #d8dce5'
+        var tag = document.getElementsByClassName("tags-view-item")
+        console.log('tag', tag)
+        for (let i in tag) {
+          tag[i].classList.add("changeColor")
+          // tag[i].classList.remove("default")
+        }
+        // console.log('this.$refs.scrollContainer', this.$refs.tag);
+      } else {
+        // this.$refs.tagsViewContainer.style.backgroundColor = ''
+        // this.$refs.tagsViewContainer.style.borderTop = '1px solid #d8dce5'
+        var tag = document.getElementsByClassName("tags-view-item")
+        for (let i in tag) {
+          tag[i].classList.remove("changeColor")
+          // tag[i].classList.add("default")
+        }
+      }
+    },
     $route() {
       this.addTags()
       this.moveToCurrentTag()
@@ -60,6 +91,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.$route, this.changeColor);
     this.initTags()
     this.addTags()
   },
@@ -68,11 +100,23 @@ export default {
       return route.path === this.$route.path
     },
     activeStyle(tag) {
+      if (this.changeColor) {
+        if (!this.isActive(tag)) return {
+          "background-color": 'rgba(0, 59, 115, 1)',
+          "border-color": 'rgba(0, 59, 115, 1)',
+          "color": 'rgba(255, 255, 255, 1)'
+        };
+        return {
+          "background-color": this.theme,
+          "border-color": this.theme
+        };
+      } else {
         if (!this.isActive(tag)) return {};
         return {
           "background-color": this.theme,
           "border-color": this.theme
         };
+      }
     },
     isAffix(tag) {
       return tag.meta && tag.meta.affix
@@ -230,6 +274,14 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+// :root{
+//   --theme-color: rgba(0, 0, 0, 0.45);
+//   --theme-background: #f4f4f4ff;
+// }
+.changeColor{
+  --theme-background: rgba(0, 59, 115, 1);
+  --theme-color: rgba(255, 255, 255, 1);
+}
 .tags-view-container {
   height: 42px;
   width: 100%;
@@ -245,8 +297,8 @@ export default {
       cursor: pointer;
       height: 28px;
       line-height: 28px;
-      color: rgba(0, 0, 0, 0.45);
+      color: var(--theme-color,rgba(0, 0, 0, 0.45));
-      background: #F4F4F4FF;
+      background:var(--theme-background,#f4f4f4ff);
       padding: 0 8px 0 12px;
       font-size: 14px;
       letter-spacing: 1px;
@@ -331,7 +383,7 @@ export default {
       .el-icon-close {
         &:hover {
           background-color: #fff;
-          color: #409eff;
+          color: rgba(62, 142, 247, 1);
         }
       }
     }

src/layout/index.vue

@@ -2,7 +2,8 @@
   <div :class="classObj" class="app-wrapper" :style="{ '--current-color': theme }">
     <div v-if="device === 'mobile' && sidebar.opened" class="drawer-bg" @click="handleClickOutside" />
     <sidebar v-if="!sidebar.hide" class="sidebar-container" />
-    <div :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
+    <div :style="changeColor ? 'background: rgba(0, 21, 41, 1)' : ''" ref="mainContainer"
+      :class="{ hasTagsView: needTagsView, sidebarHide: sidebar.hide }" class="main-container">
       <div :class="{ 'fixed-header': fixedHeader }">
         <navbar />
         <tags-view v-if="needTagsView" />
@@ -39,6 +40,13 @@ export default {
       needTagsView: state => state.settings.tagsView,
       fixedHeader: state => state.settings.fixedHeader
     }),
+    changeColor() {
+      if (this.$route.path == '/copilot/efficiency-container' || this.$route.path == '/copilot/main' || this.$route.path == '/factoryData/hdIndex' || this.$route.path === '/factoryData/factory-data') {
+        return true
+      } else {
+        return false
+      }
+    },
     classObj() {
       return {
         hideSidebar: !this.sidebar.opened,
@@ -51,6 +59,16 @@ export default {
       return variables;
     }
   },
+  watch: {
+    // changeColor(val) {
+    //   if (val == true) {
+    //     // console.log('this.$refs.mainContainer', this.$refs.mainContainer);
+    //     this.$refs.mainContainer.style.backgroundColor = 'rgba(0, 21, 41, 1)'
+    //   } else {
+    //     this.$refs.mainContainer.style.backgroundColor = ''
+    //   }
+    // },
+  },
   methods: {
     handleClickOutside() {
       this.$store.dispatch('app/closeSideBar', { withoutAnimation: false })

src/views/components/ChartContainer.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-03 15:38:31
+ * @LastEditTime: 2024-07-09 15:59:41
+ * @LastEditors: zhp
+ * @Description:
+-->
 <!--
     filename: ChartContainer.vue
     author: liubin
@@ -43,7 +50,7 @@ export default {
 }
 
 ::-webkit-scrollbar {
-  width: 8px;
+  width: 80%;
   height: 8px;
 }
 

src/views/copilot/components/BarChartBase.vue

@@ -62,7 +62,32 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+          backgroundColor: '#001829',
+          borderColor: '#001829',
+          formatter: params => {
+            console.log('params', params)
+            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                "<br/>" +
+                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
+                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
+                `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
+            }
+            return res;
+          },
+        },
         xAxis: {
           axisTick: {
             show: false,
@@ -188,13 +213,13 @@ export default {
       this.canvasReset()
     },
     isFullscreen(val) {
-      this.actualOptions.series.map((item) => {
+      this.options.series.map((item) => {
         item.barWidth = val ? 18 : 12;
       });
-      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.options.xAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.options.yAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.options.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.actualOptions);
+      this.initChart(this.options);
       // this.actualOptions.series.map((item) => {
       //   item.barWidth = val ? 18 : 12;
       // });
@@ -209,14 +234,14 @@ export default {
         this.initChart(this.options);
         return;
       }
-      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      // const actualOptions = JSON.parse(JSON.stringify(this.options));
-      console.log('actualOptions', this.options)
+      // console.log('actualOptions', this.options)
-      actualOptions.series[0].data = val[0].data;
+      this.options.series[0].data = val[0].data;
-      actualOptions.series[0].name = val[0].name;
+      this.options.series[0].name = val[0].name;
-      actualOptions.series[1].data = val?.[1]?.data || [];
+      this.options.series[1].data = val?.[1]?.data || [];
-      actualOptions.series[1].name = val?.[1]?.name || "";
+      this.options.series[1].name = val?.[1]?.name || "";
-      this.actualOptions = actualOptions;
+      // this.actualOptions = actualOptions;
-      this.initChart(actualOptions);
+      this.initChart(this.options);
     },
   },
   mounted() {
@@ -225,7 +250,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    this.actualOptions = this.options
+    // this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -249,7 +274,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.chart);
-      this.chart.setOption(this.actualOptions);
+      this.chart.setOption(this.options);
     },
   },
 };

src/views/copilot/components/Container.vue

@@ -122,7 +122,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;

src/views/copilot/components/ContainerIcon.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-05-07 16:54:54
+ * @LastEditTime: 2024-07-09 16:55:58
  * @LastEditors: zhp
  * @Description:
 -->
@@ -61,8 +61,8 @@ export default {
 .container-icon {
   //   width: 32px;
   //   height: 32px;
-  width: 1.701vw;
+  width: 1.4vw;
-  height: 1.701vw;
+  height: 1.4vw;
   background: #ccc2;
 }
 </style>

src/views/copilot/components/bottomLeftContainer.vue

@@ -0,0 +1,226 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-09 15:07:50
+ * @LastEditTime: 2024-07-09 15:41:38
+ * @LastEditors: zhp
+ * @Description:
+-->
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-05 09:43:51
+ * @LastEditTime: 2024-07-09 15:06:52
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div class="copilot-container">
+    <!-- refresh btn  -->
+    <button v-if="false" style="
+        appearance: none;
+        outline: none;
+        border: none;
+        background: none;
+        color: #fff;
+        cursor: pointer;
+        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" />
+      </svg>
+    </button>
+    <!-- decoration  -->
+    <div class="corner tl"></div>
+    <div class="corner tr"></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 style="margin-left: 16px;" :icon="icon"></Icon>
+      <h2 class="container-title">{{ title }}</h2>
+    </div>
+    <div class="container-body" :class="[
+        side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
+      ]">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import ContainerIconVue from "./ContainerIcon.vue";
+export default {
+  name: "DashboardContainer",
+  components: {
+    Icon: ContainerIconVue,
+  },
+  props: {
+    side: {
+      type: String,
+      default: "left",
+    },
+    icon: {
+      type: String,
+      default: "cube",
+    },
+    title: {
+      type: String,
+      default: "Default Title",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.copilot-container {
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  box-shadow: inset 0 0 20px 1px #fff1;
+  border-left: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 10%,
+        #024798 20%,
+        transparent 90%) 1;
+  backdrop-filter: blur(4px);
+
+  &::before {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    height: 92%;
+    width: 0.11415vw;
+    border-radius: 2px;
+    top: 0%;
+    right: 0;
+    background: radial-gradient(
+      circle at center,
+      #024798 2%,
+      #024798 100%,
+      transparent
+    );
+    z-index: 1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    width: 90%;
+    height: 0.31415vh;
+    border-radius: 2px;
+    left: 8%;
+    bottom: 0;
+    background: linear-gradient(to right, transparent 60%, #024798 98%, transparent 90%);
+    z-index: 0;
+  }
+
+  .container-head {
+    // height: 40px;
+    height: 3.8vh;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .container-title {
+      font-size: 1vw;
+      line-height: 1.39vw;
+      font-weight: normal;
+      letter-spacing: 2px;
+    }
+  }
+
+  .container-body {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 0;
+  }
+
+  .corner {
+    z-index: 1;
+    position: absolute;
+    // width: 16px;
+    // height: 16px;
+    width: 0.95vw;
+    height: 0.95vw;
+  }
+
+  .corner.tl {
+    border-top: 2px solid #0175dc;
+    border-left: 2px solid #0175dc;
+    top: 0;
+    left: 0;
+  }
+
+  .corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 2px solid #0175dc;
+    border-right: 2px solid #0175dc;
+  }
+
+  .corner.bl {
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    bottom: 0;
+    left: 0;
+    // border-left: 10px solid #0175dc;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid transparent;
+    border-left: 0.532vw solid transparent;
+    border-bottom: .6vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .corner.br {
+    bottom: 0;
+    right: 0;
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    border-left: 0.532vw solid transparent;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid #0175dc;
+    // border-left: 10px solid transparent;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid #0175dc;
+    // transform: rotate(-90deg);
+
+  }
+
+  .gradient-to-right {
+    background: linear-gradient(to right, #0c3f68cc, transparent);
+  }
+
+  .gradient-to-left {
+    background: linear-gradient(to left, #0c3f68cc, transparent);
+  }
+
+  .body-gradient-to-right {
+    background: linear-gradient(to right, #0003, transparent);
+  }
+
+  .body-gradient-to-left {
+    background: linear-gradient(to left, #0003, transparent);
+  }
+}
+</style>

src/views/copilot/components/bottomRightContainer.vue

@@ -0,0 +1,219 @@
+<!--
+    filename: Container.vue
+    author: liubin
+    date: 2024-04-09 10:44:09
+    description:
+-->
+
+<template>
+  <div class="copilot-container">
+    <!-- refresh btn  -->
+    <button v-if="false" style="
+        appearance: none;
+        outline: none;
+        border: none;
+        background: none;
+        color: #fff;
+        cursor: pointer;
+        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" />
+      </svg>
+    </button>
+    <!-- decoration  -->
+    <div class="corner tl"></div>
+    <div class="corner tr"></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 style="margin-left: 16px;" :icon="icon"></Icon>
+      <h2 class="container-title">{{ title }}</h2>
+    </div>
+    <div class="container-body" :class="[
+        side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
+      ]">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import ContainerIconVue from "./ContainerIcon.vue";
+export default {
+  name: "DashboardContainer",
+  components: {
+    Icon: ContainerIconVue,
+  },
+  props: {
+    side: {
+      type: String,
+      default: "left",
+    },
+    icon: {
+      type: String,
+      default: "cube",
+    },
+    title: {
+      type: String,
+      default: "Default Title",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+
+.copilot-container {
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  box-shadow: inset 0 0 20px 1px #fff1;
+  border-right: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 10%,
+        #024798 20%,
+        transparent 90%) 1;
+  backdrop-filter: blur(4px);
+
+  &::before {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    height: 92%;
+    width: 0.11415vw;
+    border-radius: 2px;
+    top: 0%;
+    left: 0;
+    background: radial-gradient(
+      circle at center,
+      #024798 2%,
+      #024798 100%,
+      transparent
+    );
+    z-index: 1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    width: 95%;
+    height: 0.31415vh;
+    border-radius: 2px;
+    right: 3%;
+    bottom: 0;
+    background: linear-gradient(to left, transparent 60%, #024798 98%, transparent 98%);
+    z-index: 0;
+  }
+
+  .container-head {
+    // height: 40px;
+    height: 3.8vh;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .container-title {
+      font-size: 1vw;
+      line-height: 1.39vw;
+      font-weight: normal;
+      letter-spacing: 2px;
+    }
+  }
+
+  .container-body {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 0;
+  }
+
+  .corner {
+    z-index: 1;
+    position: absolute;
+    // width: 16px;
+    // height: 16px;
+    width: 0.95vw;
+    height: 0.95vw;
+  }
+
+  .corner.tl {
+    border-top: 2px solid #0175dc;
+    border-left: 2px solid #0175dc;
+    top: 0;
+    left: 0;
+  }
+
+  .corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 2px solid #0175dc;
+    border-right: 2px solid #0175dc;
+  }
+
+  .corner.bl {
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    bottom: 0;
+    left: 0;
+    // border-left: 10px solid #0175dc;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid transparent;
+    border-left: 0.532vw solid #0175dc;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .corner.br {
+    bottom: 0;
+    right: 0;
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    // border-left: 10px solid transparent;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid #0175dc;
+    // transform: rotate(-90deg);
+    border-left: 0.532vw solid transparent;
+    border-bottom: .6vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .gradient-to-right {
+    background: linear-gradient(to right, #0c3f68cc, transparent);
+  }
+
+  .gradient-to-left {
+    background: linear-gradient(to left, #0c3f68cc, transparent);
+  }
+
+  .body-gradient-to-right {
+    background: linear-gradient(to right, #0003, transparent);
+  }
+
+  .body-gradient-to-left {
+    background: linear-gradient(to left, #0003, transparent);
+  }
+}
+</style>

src/views/copilot/components/efficiencyLeftContainer.vue

@@ -0,0 +1,219 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-09 15:15:00
+ * @LastEditTime: 2024-07-09 15:36:49
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div class="copilot-container">
+    <!-- refresh btn  -->
+    <button v-if="false" style="
+        appearance: none;
+        outline: none;
+        border: none;
+        background: none;
+        color: #fff;
+        cursor: pointer;
+        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" />
+      </svg>
+    </button>
+    <!-- decoration  -->
+    <div class="corner tl"></div>
+    <div class="corner tr"></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 style="margin-left: 16px;" :icon="icon"></Icon>
+      <h2 class="container-title">{{ title }}</h2>
+    </div>
+    <div class="container-body" :class="[
+        side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
+      ]">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import ContainerIconVue from "./ContainerIcon.vue";
+export default {
+  name: "DashboardContainer",
+  components: {
+    Icon: ContainerIconVue,
+  },
+  props: {
+    side: {
+      type: String,
+      default: "left",
+    },
+    icon: {
+      type: String,
+      default: "cube",
+    },
+    title: {
+      type: String,
+      default: "Default Title",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.copilot-container {
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  box-shadow: inset 0 0 20px 1px #fff1;
+  border-left: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 5%,
+        #024798 10%,
+        transparent 90%) 1;
+  backdrop-filter: blur(4px);
+
+  &::before {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    height: 92%;
+    width: 0.11415vw;
+    border-radius: 2px;
+    top: 0%;
+    right: 0;
+    background: radial-gradient(
+      circle at center,
+      #024798 5%,
+      #024798 100%,
+      transparent
+    );
+    z-index: 1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    width: 90%;
+    height: 0.31415vh;
+    border-radius: 2px;
+    left: 10%;
+    bottom: 0;
+    background: linear-gradient(to right,transparent 60%, #024798 95%, transparent 97%);
+    z-index: 0;
+  }
+
+  .container-head {
+    // height: 40px;
+    height: 3.8vh;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .container-title {
+      font-size: 1vw;
+      line-height: 1.39vw;
+      font-weight: normal;
+      letter-spacing: 2px;
+    }
+  }
+
+  .container-body {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 0;
+  }
+
+  .corner {
+    z-index: 1;
+    position: absolute;
+    // width: 16px;
+    // height: 16px;
+    width: 0.95vw;
+    height: 0.95vw;
+  }
+
+  .corner.tl {
+    border-top: 2px solid #0175dc;
+    border-left: 2px solid #0175dc;
+    top: 0;
+    left: 0;
+  }
+
+  .corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 2px solid #0175dc;
+    border-right: 2px solid #0175dc;
+  }
+
+  .corner.bl {
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    bottom: 0;
+    left: 0;
+    // border-left: 10px solid #0175dc;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid transparent;
+    border-left: 0.532vw solid transparent;
+    border-bottom: .6vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .corner.br {
+    bottom: 0;
+    right: 0;
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    border-left: 0.532vw solid transparent;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid #0175dc;
+    // border-left: 10px solid transparent;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid #0175dc;
+    // transform: rotate(-90deg);
+
+  }
+
+  .gradient-to-right {
+    background: linear-gradient(to right, #0c3f68cc, transparent);
+  }
+
+  .gradient-to-left {
+    background: linear-gradient(to left, #0c3f68cc, transparent);
+  }
+
+  .body-gradient-to-right {
+    background: linear-gradient(to right, #0003, transparent);
+  }
+
+  .body-gradient-to-left {
+    background: linear-gradient(to left, #0003, transparent);
+  }
+}
+</style>

src/views/copilot/components/efficiencyRightContainer.vue

@@ -0,0 +1,219 @@
+<!--
+    filename: Container.vue
+    author: liubin
+    date: 2024-04-09 10:44:09
+    description:
+-->
+
+<template>
+  <div class="copilot-container">
+    <!-- refresh btn  -->
+    <button v-if="false" style="
+        appearance: none;
+        outline: none;
+        border: none;
+        background: none;
+        color: #fff;
+        cursor: pointer;
+        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" />
+      </svg>
+    </button>
+    <!-- decoration  -->
+    <div class="corner tl"></div>
+    <div class="corner tr"></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 style="margin-left: 16px;" :icon="icon"></Icon>
+      <h2 class="container-title">{{ title }}</h2>
+    </div>
+    <div class="container-body" :class="[
+        side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
+      ]">
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import ContainerIconVue from "./ContainerIcon.vue";
+export default {
+  name: "DashboardContainer",
+  components: {
+    Icon: ContainerIconVue,
+  },
+  props: {
+    side: {
+      type: String,
+      default: "left",
+    },
+    icon: {
+      type: String,
+      default: "cube",
+    },
+    title: {
+      type: String,
+      default: "Default Title",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+
+.copilot-container {
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  box-shadow: inset 0 0 20px 1px #fff1;
+  border-right: 0.11415vw solid;
+  border-image: linear-gradient(to bottom,transparent 5%,
+    #024798 10%,
+    transparent 90%) 1;
+  backdrop-filter: blur(4px);
+
+  &::before {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    height: 92%;
+    width: 0.11415vw;
+    border-radius: 2px;
+    top: 0%;
+    left: 0;
+    background: radial-gradient(
+      circle at center,
+      #024798 2%,
+      #024798 100%,
+      transparent
+    );
+    z-index: 1;
+  }
+
+  &::after {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    width: 95%;
+    height: 0.31415vh;
+    border-radius: 2px;
+    right: 3%;
+    bottom: 0;
+    background: linear-gradient(to left, transparent 60%, #024798 98%, transparent 98%);
+    z-index: 0;
+  }
+
+  .container-head {
+    // height: 40px;
+    height: 3.8vh;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .container-title {
+      font-size: 1vw;
+      line-height: 1.39vw;
+      font-weight: normal;
+      letter-spacing: 2px;
+    }
+  }
+
+  .container-body {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 0;
+  }
+
+  .corner {
+    z-index: 1;
+    position: absolute;
+    // width: 16px;
+    // height: 16px;
+    width: 0.95vw;
+    height: 0.95vw;
+  }
+
+  .corner.tl {
+    border-top: 2px solid #0175dc;
+    border-left: 2px solid #0175dc;
+    top: 0;
+    left: 0;
+  }
+
+  .corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 2px solid #0175dc;
+    border-right: 2px solid #0175dc;
+  }
+
+  .corner.bl {
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    bottom: 0;
+    left: 0;
+    // border-left: 10px solid #0175dc;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid transparent;
+    border-left: 0.532vw solid #0175dc;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .corner.br {
+    bottom: 0;
+    right: 0;
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    // border-left: 10px solid transparent;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid #0175dc;
+    // transform: rotate(-90deg);
+    border-left: 0.532vw solid transparent;
+    border-bottom: .6vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .gradient-to-right {
+    background: linear-gradient(to right, #0c3f68cc, transparent);
+  }
+
+  .gradient-to-left {
+    background: linear-gradient(to left, #0c3f68cc, transparent);
+  }
+
+  .body-gradient-to-right {
+    background: linear-gradient(to right, #0003, transparent);
+  }
+
+  .body-gradient-to-left {
+    background: linear-gradient(to left, #0003, transparent);
+  }
+}
+</style>

src/views/copilot/components/ftoBarChartBase.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-23 15:49:14
- * @LastEditTime: 2024-06-04 08:54:10
+ * @LastEditTime: 2024-07-03 14:08:52
  * @LastEditors: zhp
  * @Description:
 -->
@@ -63,7 +63,32 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+          backgroundColor: '#001829',
+          borderColor: '#001829',
+          formatter: params => {
+            console.log('params', params)
+            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                "<br/>" +
+                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
+                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
+              `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
+            }
+            return res;
+          },
+        },
         xAxis: {
           axisTick: {
             show: false,
@@ -189,13 +214,13 @@ export default {
       this.canvasReset()
     },
     isFullscreen(val) {
-      this.actualOptions.series.map((item) => {
+      this.options.series.map((item) => {
         item.barWidth = val ? 18 : 12;
       });
-      this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.options.xAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
+      this.options.yAxis.axisLabel.fontSize = val ? 18 : 12;
-      this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
+      this.options.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.actualOptions);
+      this.initChart(this.options);
       // this.actualOptions.series.map((item) => {
       //   item.barWidth = val ? 18 : 12;
       // });
@@ -210,14 +235,14 @@ export default {
         this.initChart(this.options);
         return;
       }
-      const actualOptions = JSON.parse(JSON.stringify(this.options));
+      // const actualOptions = JSON.parse(JSON.stringify(this.options));
-      console.log('actualOptions', this.options)
+      // console.log('actualOptions', this.options)
-      actualOptions.series[0].data = val[0].data;
+      this.options.series[0].data = val[0].data;
-      actualOptions.series[0].name = val[0].name;
+      this.options.series[0].name = val[0].name;
-      actualOptions.series[1].data = val[1].data;
+      this.options.series[1].data = val[1].data;
-      actualOptions.series[1].name = val[1].name;
+      this.options.series[1].name = val[1].name;
-      this.actualOptions = actualOptions;
+      // this.actualOptions = actualOptions;
-      this.initChart(actualOptions);
+      this.initChart(this.options);
     },
   },
   mounted() {
@@ -226,7 +251,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    this.actualOptions = this.options
+    // this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -250,7 +275,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.ftoChart);
-      this.chart.setOption(this.actualOptions);
+      this.chart.setOption(this.options);
     },
   },
 };

src/views/copilot/components/leftContainer.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-05 09:43:51
- * @LastEditTime: 2024-06-05 09:43:52
+ * @LastEditTime: 2024-07-09 15:35:19
  * @LastEditors: zhp
  * @Description:
 -->
@@ -80,23 +80,25 @@ export default {
   flex-direction: column;
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
+  border-left: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 10%,
+        #024798 20%,
+        transparent 90%) 1;
   backdrop-filter: blur(4px);
 
   &::before {
     content: "";
     position: absolute;
     display: inline-block;
-    height: 100%;
+    height: 92%;
     width: 0.11415vw;
     border-radius: 2px;
     top: 0%;
-    left: 0;
+    right: 0;
-    background: radial-gradient(
+    background: radial-gradient(circle at center,
-      circle at center,
           #024798 2%,
-      #024798 30%,
+          #024798 100%,
-      transparent
+          transparent);
-    );
     z-index: 1;
   }
 
@@ -104,12 +106,12 @@ export default {
     content: "";
     position: absolute;
     display: inline-block;
-    width: 60%;
+    width: 90%;
     height: 0.31415vh;
     border-radius: 2px;
-    left: 8%;
+    left: 7%;
     bottom: 0;
-    background: linear-gradient(to right, #024798, transparent);
+    background: linear-gradient(to right,transparent 60%, #024798 95%, transparent 97%);
     z-index: 0;
   }
 
@@ -122,7 +124,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;

src/views/copilot/components/rightContainer.vue

@@ -73,6 +73,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
 .copilot-container {
   height: 0;
   flex: 1;
@@ -80,13 +81,17 @@ export default {
   flex-direction: column;
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
+  border-right: 0.11415vw solid;
+  border-image: linear-gradient(to bottom,transparent 10%,
+    #024798 20%,
+    transparent 90%) 1;
   backdrop-filter: blur(4px);
 
   &::before {
     content: "";
     position: absolute;
     display: inline-block;
-    height: 100%;
+    height: 92%;
     width: 0.11415vw;
     border-radius: 2px;
     top: 0%;
@@ -94,7 +99,7 @@ export default {
     background: radial-gradient(
       circle at center,
       #024798 2%,
-      #024798 30%,
+      #024798 100%,
       transparent
     );
     z-index: 1;
@@ -104,12 +109,12 @@ export default {
     content: "";
     position: absolute;
     display: inline-block;
-    width: 60%;
+    width: 95%;
     height: 0.31415vh;
     border-radius: 2px;
-    left: 8%;
+    right: 1%;
     bottom: 0;
-    background: linear-gradient(to right, #024798, transparent);
+    background: linear-gradient(to left, transparent 60%, #024798 98%, transparent 98%);
     z-index: 0;
   }
 
@@ -122,7 +127,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;

src/views/copilot/components/twoContainer.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-05 09:48:37
- * @LastEditTime: 2024-06-05 09:53:49
+ * @LastEditTime: 2024-07-09 15:35:04
  * @LastEditors: zhp
  * @Description:
 -->
@@ -99,6 +99,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
 .copilot-container {
   height: 0;
   flex: 1;
@@ -106,23 +107,25 @@ export default {
   flex-direction: column;
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
+  border-right: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 10%,
+          #024798 20%,
+          transparent 90%) 1;
   backdrop-filter: blur(4px);
 
   &::before {
     content: "";
     position: absolute;
     display: inline-block;
-    height: 100%;
+    height: 92%;
     width: 0.11415vw;
     border-radius: 2px;
     top: 0%;
     left: 0;
-    background: radial-gradient(
+    background: radial-gradient(circle at center,
-      circle at center,
           #024798 2%,
-      #024798 30%,
+          #024798 100%,
-      transparent
+          transparent);
-    );
     z-index: 1;
   }
 
@@ -133,7 +136,7 @@ export default {
     width: 60%;
     height: 0.31415vh;
     border-radius: 2px;
-    left: 8%;
+    left: 6%;
     bottom: 0;
     background: linear-gradient(to right, #024798, transparent);
     z-index: 0;
@@ -148,7 +151,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;

src/views/copilot/efficiency/components/ChipOee.vue

@@ -63,49 +63,47 @@ export default {
       const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
         items = [
+          { label: `${yesterday}日目标`, color: "#58adfa" },
           { label: `${year - 1}年${yesterday}日`, color: "#12f7f1" },
           { label: `${yesterday}日`, color: "#58adfa" },
-          { label: `${yesterday}日目标`, color: "#58adfa" },
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
+          { label: `${yesterday}日目标`, color: "#58adfa" },
           { label: `${dayBeYes}日`, color: "#12f7f1" },
           { label: `${yesterday}日`, color: "#58adfa" },
-          { label: `${yesterday}日目标`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
-          { label: `${year-1}年本周`, color: "#12f7f1" },
-          { label: `本周`, color: "#58adfa" },
           { label: `本周目标`, color: "#58adfa" },
-
+          { label: `${year - 1}年本周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '环比') {
         items = [
+          { label: `本周目标`, color: "#58adfa" },
           { label: `上周`, color: "#12f7f1" },
           { label: `本周`, color: "#58adfa" },
-          { label: `本周目标`, color: "#58adfa" },
         ];
       } else if (this.period === '月' && this.than === '同比') {
         items = [
-          { label: `${year-1}年${month}月`, color: "#12f7f1" },
-          { label: `${month}月`, color: "#58adfa" },
           { label: `${month}月目标`, color: "#58adfa" },
+          { label: `${year - 1}年${month}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
           // { label: `${month}月目标`, value: valueTuple[2] },
         ];
       } else if (this.period === '月' && this.than === '环比') {
         items = [
+          { label: `${month}月目标`, color: "#58adfa" },
           { label: `${lastMonth}月`, color: "#12f7f1" },
           { label: `${month}月`, color: "#58adfa" },
-          { label: `${month}月目标`, color: "#58adfa" },
           // { label: `${month}月目标`, value: valueTuple[2] },
         ];
       } else {
         items = [
+          { label: `${year}年目标`, color: "#58adfa" },
           { label: `${year - 1}年`, color: "#12f7f1" },
           { label: `${year}年`, color: "#58adfa" },
-          { label:  `${year}年目标`, color: "#58adfa" },
-
           // { label: `${year}年目标`, value: valueTuple[2] },
         ];
       }

src/views/copilot/efficiency/components/TransformRate.vue

@@ -63,49 +63,47 @@ export default {
       const year = new Date().getFullYear();
       if (this.period === '日' && this.than === '同比') {
         items = [
+          { label: `${yesterday}日目标`, color: "#58adfa" },
           { label: `${year - 1}年${yesterday}日`, color: "#12f7f1" },
           { label: `${yesterday}日`, color: "#58adfa" },
-          { label: `${yesterday}日目标`, color: "#58adfa" },
-
         ];
       } else if (this.period === '日' && this.than === '环比') {
         items = [
+          { label: `${yesterday}日目标`, color: "#58adfa" },
           { label: `${dayBeYes}日`, color: "#12f7f1" },
           { label: `${yesterday}日`, color: "#58adfa" },
-          { label: `${yesterday}日目标`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '同比') {
         items = [
-          { label: `${year-1}年本周`, color: "#12f7f1" },
-          { label: `本周`, color: "#58adfa" },
           { label: `本周目标`, color: "#58adfa" },
+          { label: `${year - 1}年本周`, color: "#12f7f1" },
+          { label: `本周`, color: "#58adfa" },
         ];
       } else if (this.period === '周' && this.than === '环比') {
         items = [
+          { label: `本周目标`, color: "#58adfa" },
           { label: `上周`, color: "#12f7f1" },
           { label: `本周`, color: "#58adfa" },
-          { label: `本周目标`, color: "#58adfa" },
         ];
       } else if (this.period === '月' && this.than === '同比') {
         items = [
-          { label: `${year-1}年${month}月`, color: "#12f7f1" },
-          { label: `${month}月`, color: "#58adfa" },
           { label: `${month}月目标`, color: "#58adfa" },
+          { label: `${year - 1}年${month}月`, color: "#12f7f1" },
+          { label: `${month}月`, color: "#58adfa" },
           // { label: `${month}月目标`, value: valueTuple[2] },
         ];
       } else if (this.period === '月' && this.than === '环比') {
         items = [
+          { label: `${month}月目标`, color: "#58adfa" },
           { label: `${lastMonth}月`, color: "#12f7f1" },
           { label: `${month}月`, color: "#58adfa" },
-          { label: `${month}月目标`, color: "#58adfa" },
           // { label: `${month}月目标`, value: valueTuple[2] },
         ];
       } else {
         items = [
+          { label: `${year}年目标`, color: "#58adfa" },
           { label: `${year - 1}年`, color: "#12f7f1" },
           { label: `${year}年`, color: "#58adfa" },
-          { label: `${year}年目标`, color: "#58adfa" },
-
           // { label: `${year}年目标`, value: valueTuple[2] },
         ];
       }

src/views/copilot/efficiency/components/sub/bar/BarChartChipOEE.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 13:22:43
- * @LastEditTime: 2024-06-17 09:22:17
+ * @LastEditTime: 2024-07-09 14:51:21
  * @LastEditors: zhp
  * @Description:
 -->
@@ -62,7 +62,35 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+          backgroundColor: '#001829',
+          borderColor: '#001829',
+          formatter: params => {
+            console.log('params', params)
+            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                "<br/>" +
+              `${params[i].seriesType === "line"
+                ? '<img width="11" height="11" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
+                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${color}"></span>`
+              }` +
+                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
+              `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '%' : 0 + '%'}</span>`;
+            }
+            return res;
+          },
+        },
         xAxis: {
           axisTick: {
             show: false,
@@ -241,7 +269,7 @@ export default {
       // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.actualOptions)
+      this.initChart(this.options)
       this.canvasReset()
     },
     series(val) {
@@ -252,14 +280,14 @@ export default {
       // console.log('val', val)
       const actualOptions = JSON.parse(JSON.stringify(this.options))
       console.log(actualOptions)
-      actualOptions.series[0].data = val[0].data;
+      this.options.series[0].data = val[0].data;
-      actualOptions.series[0].name = val[0].name;
+      this.options.series[0].name = val[0].name;
-      actualOptions.series[1].data = val?.[1]?.data;
+      this.options.series[1].data = val?.[1]?.data;
-      actualOptions.series[1].name = val?.[1]?.name;
+      this.options.series[1].name = val?.[1]?.name;
-      actualOptions.series[2].data = val?.[2]?.data || [];
+      this.options.series[2].data = val?.[2]?.data || [];
-      actualOptions.series[2].name = val?.[2]?.name || "";
+      this.options.series[2].name = val?.[2]?.name || "";
       this.actualOptions = actualOptions;
-      this.initChart(actualOptions);
+      this.initChart(this.options);
     },
   },
   mounted() {
@@ -273,7 +301,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    this.actualOptions = this.options
+    // this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -296,7 +324,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.oeeChart);
-      this.chart.setOption(this.actualOptions);
+      this.chart.setOption(this.options);
     },
   },
 };
@@ -328,10 +356,10 @@ export default {
       margin-right: 0.22vw;
     }
   }
-     .legend-item:nth-child(3) {
+     .legend-item:nth-child(1) {
        margin-left: 1vw;
      }
- .legend-item:nth-child(3):before {
+ .legend-item:nth-child(1):before {
    // width: 12px;
    // height: 2px;
    width: 1vw;
@@ -340,11 +368,11 @@ export default {
    position: absolute;
    top: 50%;
    // left: -16px;
-   left: -0.951vw;
+   left: -1.3vw;
    transform: translateY(-50%);
  }
 
- .legend-item:nth-child(3):after {
+ .legend-item:nth-child(1):after {
    background-color: #f3c000;
    content: "";
    display: inline-block;
@@ -355,15 +383,15 @@ export default {
    height: 0.3191vw;
    border-radius: 100%;
    top: 50%;
-   left: -0.851vw;
+   left: -1.13vw;
    // left: -16px;
    transform: translateY(-50%) translateX(50%);
  }
-  .legend-item:nth-child(1):before {
+  .legend-item:nth-child(2):before {
     background-color: #12f7f1;
   }
 
-  .legend-item:nth-child(2):before {
+  .legend-item:nth-child(3):before {
     background-color: #58adfa;
   }
 }

src/views/copilot/efficiency/components/sub/bar/BarChartChipTrans.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-23 15:50:44
- * @LastEditTime: 2024-06-17 09:23:39
+ * @LastEditTime: 2024-07-09 14:57:49
  * @LastEditors: zhp
  * @Description:
 -->
@@ -62,7 +62,35 @@ export default {
           top: "15%",
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+          backgroundColor: '#001829',
+          borderColor: '#001829',
+          formatter: params => {
+            console.log('params', params)
+            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+              // console.log(item.color, color);
+              res +=
+                "<br/>" +
+              `${params[i].seriesType === "line"
+                ? '<img width="11" height="11" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
+                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${color}"></span>`
+              }` +
+                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
+              `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '%' : 0 + '%'}</span>`;
+            }
+            return res;
+          },
+        },
         xAxis: {
           axisTick: {
             show: false,
@@ -241,7 +269,7 @@ export default {
       // this.actualOptions.xAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.axisLabel.fontSize = val ? 18 : 12;
       // this.actualOptions.yAxis.nameTextStyle.fontSize = val ? 18 : 12;
-      this.initChart(this.actualOptions)
+      this.initChart(this.options)
       this.canvasReset()
     },
     series(val) {
@@ -250,15 +278,15 @@ export default {
         return;
       }
       console.log(val)
-      const actualOptions = JSON.parse(JSON.stringify(this.options))
+      // const actualOptions = JSON.parse(JSON.stringify(this.options))
-      actualOptions.series[0].data = val[0].data;
+      this.options.series[0].data = val[0].data;
-      actualOptions.series[0].name = val[0].name;
+      this.options.series[0].name = val[0].name;
-      actualOptions.series[1].data = val?.[1]?.data || [];
+      this.options.series[1].data = val?.[1]?.data || [];
-      actualOptions.series[1].name = val?.[1]?.name || "";
+      this.options.series[1].name = val?.[1]?.name || "";
-      actualOptions.series[2].data = val?.[2]?.data || [];
+      this.options.series[2].data = val?.[2]?.data || [];
-      actualOptions.series[2].name = val?.[2]?.name || "";
+      this.options.series[2].name = val?.[2]?.name || "";
-      this.actualOptions = actualOptions;
+      // this.actualOptions = actualOptions;
-      this.initChart(actualOptions);
+      this.initChart(this.options);
     },
   },
   mounted() {
@@ -272,7 +300,7 @@ export default {
         this.isFullscreen = screenfull.isFullscreen;
       });
     }
-    this.actualOptions = this.options
+    // this.actualOptions = this.options
     this.canvasReset();
     window.addEventListener("resize", this.canvasReset);
   },
@@ -295,7 +323,7 @@ export default {
         this.chart.dispose();
       }
       this.chart = echarts.init(this.$refs.oeeChart);
-      this.chart.setOption(this.actualOptions);
+      this.chart.setOption(this.options);
     },
   },
 };
@@ -327,17 +355,17 @@ export default {
       margin-right: 0.22vw;
     }
   }
- .legend-item:nth-child(3) {
+ .legend-item:nth-child(1) {
    margin-left: 1vw;
  }
-  .legend-item:nth-child(1):before {
+  .legend-item:nth-child(2):before {
     background-color: #12f7f1;
   }
 
-  .legend-item:nth-child(2):before {
+  .legend-item:nth-child(3):before {
     background-color: #58adfa;
   }
-    .legend-item:nth-child(3):before {
+ .legend-item:nth-child(1):before {
    // width: 12px;
    // height: 2px;
    width: 1vw;
@@ -346,11 +374,11 @@ export default {
    position: absolute;
    top: 50%;
    // left: -16px;
-      left: -0.951vw;
+   left: -1.3vw;
    transform: translateY(-50%);
  }
 
-    .legend-item:nth-child(3):after {
+ .legend-item:nth-child(1):after {
    background-color: #f3c000;
    content: "";
    display: inline-block;
@@ -361,7 +389,7 @@ export default {
    height: 0.3191vw;
    border-radius: 100%;
    top: 50%;
-      left: -0.851vw;
+   left: -1.13vw;
    // left: -16px;
    transform: translateY(-50%) translateX(50%);
  }

src/views/copilot/efficiency/components/sub/chip/ChipRateItem.vue

@@ -318,6 +318,8 @@ export default {
   .legend-item {
     margin-left: 15px;
     display: flex;
+    font-size: 16px;
+    // font-weight: 600;
     flex-direction: column;
     // align-items: center;
     align-items: flex-start;
@@ -371,8 +373,6 @@ export default {
   background: #003982;
 }
   .legend-item__value {
-    font-size: 24px;
-    font-weight: 600;
   }
 }
 </style>

src/views/copilot/efficiency/components/sub/std/ProgressBar.vue

@@ -52,7 +52,7 @@ export default {
           ? 0
         : this.current != 0 && this.target != 0
           ? `${((this.current / this.target) * 100).toFixed(2)}%`
-          : this.current != 0 && this.target == 0 && this.current >= 100 ? 100 + '%' : this.current != 0 && this.target == 0 && this.current < 100 ? this.current + '%' : 0 + '%'
+          : this.current != 0 && this.target == 0 && this.current >= 100 ? 100 + '%' : this.current != 0 && this.target == 0 && this.current < 100 ? parseFloat(this.current).toFixed(2) + '%' : 0 + '%'
       // } else if(this.previous != 0) {
       //   return this.previous + '%'
       // }

src/views/copilot/efficiency/components/sub/std/StdRateItem.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:25:10
- * @LastEditTime: 2024-06-27 09:13:38
+ * @LastEditTime: 2024-07-09 15:04:24
  * @LastEditors: zhp
  * @Description:
 -->
@@ -150,7 +150,7 @@ export default {
   align-items: center;
   gap: 8px;
   flex: 1 1 auto;
-  padding: 12px;
+  padding: 16px;
 }
 
 .std-rate-item__value {

src/views/copilot/efficiency/components/sub/std/preProgressBar.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-27 09:12:54
- * @LastEditTime: 2024-06-27 09:14:21
+ * @LastEditTime: 2024-07-09 15:02:46
  * @LastEditors: zhp
  * @Description:
 -->
@@ -49,7 +49,7 @@ export default {
     dataRate() {
       // if (this.current != 0 && this.target != 0) {
         // console.log( '1111111111', this.current, this.target,this.previous);
-      return this.previous >=100 ? 100 + '%' : this.previous + '%';
+      return this.previous >= 100 ? 100 + '%' : parseFloat(this.previous).toFixed(2) + '%';
       // } else if(this.previous != 0) {
       //   return this.previous + '%'
       // }

src/views/copilot/efficiency/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-07 10:04:53
- * @LastEditTime: 2024-07-01 12:27:45
+ * @LastEditTime: 2024-07-09 15:16:43
  * @LastEditors: zhp
  * @Description:
 -->
@@ -30,8 +30,9 @@
 </template>
 
 <script>
-import Container from "@/views/copilot/components/rightContainer.vue";
+import Container from "@/views/copilot/components/efficiencyRightContainer.vue";
-import leftContainer from "@/views/copilot/components/leftContainer.vue";
+import leftContainer from "@/views/copilot/components/efficiencyLeftContainer.vue";
+
 import ChipOeeVue from "./components/ChipOee.vue";
 import ChipRateVue from "./components/ChipRate.vue";
 import StdRateVue from "./components/StdRate.vue";

src/views/copilot/efficiency/options/chipOptions.js

@@ -1,4 +1,4 @@
-export default ({
+ export default ({
   titleValue,
   subtitle,
   previousSum,
@@ -15,7 +15,12 @@ export default ({
     top: 0,
     containLabel: true,
   },
-  tooltip: {},
+  tooltip: {
+    trigger: "item",
+    extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+    backgroundColor: '#001829',
+    borderColor: '#001829',
+  },
   title: {
     text: titleValue,
     left: "48%",
@@ -62,7 +67,8 @@ export default ({
           value: currentSum,
           name: currentName,
           tooltip: {
-            formatter: `${currentName} : ${currentSum}`
+            formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${currentName}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${currentSum}</span>`
           },
           selected: false,
           itemStyle: {
@@ -87,7 +93,8 @@ export default ({
           value:(targetSum - currentSum) === 0 ? 1 : (targetSum - currentSum),
           name: currentName,
           tooltip: {
-            formatter: `${currentName} : ${currentSum}`
+            formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${currentName}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${currentSum}</span>`
           },
           itemStyle: { color: "transparent" },
           label: { show: false },
@@ -111,7 +118,8 @@ export default ({
           value: previousSum,
           name: preName,
            tooltip: {
-            formatter: `${preName} : ${previousSum}`
+             formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${preName}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${previousSum}</span>`
           },
           selected: false,
           itemStyle: {
@@ -136,7 +144,8 @@ export default ({
           value:previousSum === 0 ? 1 : 0,
           name: preName,
           tooltip: {
-            formatter: `${preName} : ${previousSum}`
+              formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${preName}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${previousSum}</span>`
           },
           itemStyle: { color: "transparent" },
           label: { show: false },

src/views/copilot/factoryData/components/BarChartBase.vue

@@ -80,7 +80,7 @@ export default {
               res +=
                 `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
               `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${params[0].axisValueLabel}</span>` +
-              `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value + '片'}</span>`;
+              `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
             }
             return res;
           },
@@ -117,6 +117,7 @@ export default {
         yAxis: {
             type: "value",
             name: "单位/片",
+            position: 'left',
             nameTextStyle: {
               color: "rgba(255, 255, 255, 0.7)",
               fontSize: 12,

src/views/copilot/factoryData/components/BarChartChipOEE.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-30 08:58:39
- * @LastEditTime: 2024-07-02 10:53:34
+ * @LastEditTime: 2024-07-03 14:10:06
  * @LastEditors: zhp
  * @Description:
 -->
@@ -110,7 +110,7 @@ export default {
                   "<br/>" +
                   `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
                   `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
-                  `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value + '片'}</span>`;
+                  `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
               }
               return res;
             },
@@ -132,6 +132,7 @@ export default {
         },
         yAxis: {
           name: "单位/片",
+          position: 'left',
           nameTextStyle: {
             color: "#fff",
             fontSize: 12,
@@ -337,6 +338,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
 .bar-chart-base {
   // position: relative;
 
@@ -350,7 +352,7 @@ export default {
     position: relative;
     // font-size: 12px;
     margin-right:1.2vw;
-
+    color: #DFF1FE;
     &::before {
       content: "";
       display: inline-block;

src/views/copilot/factoryData/components/ContainerIcon.vue

@@ -1,3 +1,10 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-03 15:38:31
+ * @LastEditTime: 2024-07-09 16:49:22
+ * @LastEditors: zhp
+ * @Description:
+-->
 <!--
     filename: ContainerIcon.vue
     author: liubin
@@ -49,8 +56,8 @@ export default {
 .container-icon {
   //   width: 32px;
   //   height: 32px;
-  width: 1.701vw;
+  width: 1.4vw;
-  height: 1.701vw;
+  height: 1.4vw;
   background: #ccc2;
 }
 </style>

src/views/copilot/factoryData/components/Order.vue

@@ -40,6 +40,7 @@ export default {
         evenRowBGC: "rgba(rgba(2, 13, 45, 0.18)",
         data: [],
         rowNum: 12,
+        fontSize:14,
         waitTime: 3000,
         columnWidth: [150],
         align: ["left"],
@@ -113,19 +114,19 @@ export default {
               `<span title=${this.prodOrder[i].actualProduction || ""}>${this.prodOrder[i].actualProduction || ""
               }</span>`,
               `<span style="display:inline-block;width:45px;">${this.prodOrder[i].productionProgress
-                ? this.prodOrder[i].productionProgress.toFixed(0) + "%"
+                ? this.prodOrder[i].productionProgress.toFixed(2) * 100 + "%"
                 : "0%"
               }</span>
             <div style="display:inline-block;height:20px;margin-top:-5px;vertical-align:middle;">
             <svg xmlns="http://www.w3.org/200/svg" height="20" width="20">
               <circle cx="10" cy="10" r="6" fill="none" stroke="#283851" stroke-width="4" stroke-linecap="round"/>
               <circle style="transform-origin: center;transform: rotate(-90deg);" id="J_progress_bar" cx="10" cy="10" r="6" fill="none" stroke="#47FF27" stroke-width="4" stroke-dasharray="${this.prodOrder[i].productionProgress
-                ? this.prodOrder[i].productionProgress.toFixed(0) *
+                ? this.prodOrder[i].productionProgress.toFixed(2) *100 *
                 37.68 *
                 0.01 +
                 "," +
                 (1 -
-                  this.prodOrder[i].productionProgress.toFixed(0) * 0.01) *
+                  this.prodOrder[i].productionProgress.toFixed(2) * 0.01) * 100 *
                 37.68
                 : 0 + "," + 37.68
               }"/>

src/views/copilot/factoryData/components/ProdMonitor.vue

@@ -192,15 +192,12 @@ export default {
     this.makeData();
     this.$nextTick(() => {
       let button = document.getElementsByClassName('button-than')
-      console.log(button);
       button[0].children[0].style.borderRadius = '4px 0 0 4px'
       button[0].children[1].style.borderRadius = '0px 4px 4px 0'
-      console.log(button[0].children[0].style);
     })
   },
   methods: {
     makeData() {
-      console.log('msgObj', this.msgObj);
       this.msgObj.chip = {};
       this.msgObj.stand = {};
       this.msgObj.bipv = {};
@@ -249,7 +246,7 @@ export default {
           // width: 5vw;
           color: #FFFFFF;
           line-height: 24px;
-          text-align: left;
+          // text-align: left;
           font-style: normal;
           display: inline-block;
       }

src/views/copilot/factoryData/components/button.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-06 14:22:56
- * @LastEditTime: 2024-06-07 10:53:39
+ * @LastEditTime: 2024-07-02 13:54:08
  * @LastEditors: zhp
  * @Description:
 -->
@@ -62,7 +62,7 @@ button {
   font-size: 16px;
   color: #FFFFFF;
   line-height: 22px;
-  letter-spacing: 5px;
+  /* letter-spacing: 5px; */
   text-align: center;
   font-style: normal;
   letter-spacing: 10px;

src/views/copilot/factoryData/components/leftContainer.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-05 09:36:07
- * @LastEditTime: 2024-06-05 09:38:23
+ * @LastEditTime: 2024-07-09 16:54:24
  * @LastEditors: zhp
  * @Description:
 -->
@@ -80,6 +80,7 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
 .copilot-container {
   height: 0;
   flex: 1;
@@ -87,21 +88,23 @@ export default {
   flex-direction: column;
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
+  border-left: 0.11415vw solid;
+  border-image: linear-gradient(to bottom, transparent 2%, rgba(5, 138, 237, .7) 20%, rgba(2, 82, 215, 0.24) 70%, ) 71 71;
   backdrop-filter: blur(4px);
 
   &::before {
     content: "";
     position: absolute;
     display: inline-block;
-    height: 100%;
+    height: 96%;
     width: 0.11415vw;
     border-radius: 2px;
     top: 0%;
-    left: 0;
+    right: 0;
     background: radial-gradient(
       circle at center,
       #024798 2%,
-      #024798 30%,
+      #024798 100%,
       transparent
     );
     z-index: 1;
@@ -111,12 +114,12 @@ export default {
     content: "";
     position: absolute;
     display: inline-block;
-    width: 60%;
+    width: 80%;
     height: 0.31415vh;
     border-radius: 2px;
-    left: 8%;
+    right: 4%;
     bottom: 0;
-    background: linear-gradient(to right, #024798, transparent);
+    background: linear-gradient(to right, transparent 10%, #024798 95%, transparent 98%);
     z-index: 0;
   }
 
@@ -129,7 +132,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;

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 style="margin-left: 16px;" :icon="icon"></Icon>
       <h2 class="container-title">{{ title }}</h2>
     </div>
     <div class="container-body" :class="[
@@ -78,30 +78,30 @@ export default {
 </script>
 
 <style scoped lang="scss">
+
 .copilot-container {
-  height: 0;
+  height: 100%;
   flex: 1;
   display: flex;
   flex-direction: column;
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
+  border-right: 0.11415vw solid;
+  border-image: linear-gradient(to bottom,transparent 0%,rgba(5, 138, 237, .7) 40%, rgba(2, 82, 215, 0.24) 70%,) 71 71;
   backdrop-filter: blur(4px);
-
   &::before {
     content: "";
     position: absolute;
     display: inline-block;
-    height: 100%;
+    height: 96%;
       width: 0.11415vw;
       border-radius: 2px;
       top: 0%;
       left: 0;
-    background: radial-gradient(
+      background: radial-gradient(circle at center,
-      circle at center,
           #024798 2%,
-      #024798 30%,
+          #024798 100%,
-      transparent
+          transparent);
-    );
     z-index: 1;
   }
 
@@ -109,12 +109,12 @@ export default {
     content: "";
     position: absolute;
     display: inline-block;
-    width: 60%;
+    width: 80%;
     height: 0.31415vh;
     border-radius: 2px;
-    left: 8%;
+    left: 3%;
     bottom: 0;
-    background: linear-gradient(to right, #024798, transparent);
+    background: linear-gradient(to left, transparent 10%, #024798 95%, transparent 98%);
     z-index: 0;
   }
 
@@ -127,7 +127,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;

src/views/copilot/factoryData/hdIndex.vue

@@ -88,7 +88,7 @@ export default {
     updateThan(val) {
       console.log(val);
       this.than = val;
-      // this.getMes();
+      this.getMes()
     },
     updatePeriod(val) {
       this.period = val;

src/views/copilot/factoryData/index.vue

@@ -196,7 +196,7 @@ export default {
     gap: 16px;
     .flex {
       display: flex;
-      gap: 20px;
+      gap: 16px;
       flex: 1;
     }
     .top > div,

src/views/copilot/yield/components/sub/ring/DoubleRingChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-20 13:32:59
- * @LastEditTime: 2024-06-17 16:42:12
+ * @LastEditTime: 2024-07-09 08:58:47
  * @LastEditors: zhp
  * @Description:
 -->
@@ -312,7 +312,7 @@ function calculateItems(period, valueTuple, than) {
 }
 
 .double-ring-chart__legend {
-  padding: 12px;
+  /* padding: 12px; */
   color: #fff;
   display: flex;
   justify-content: center;

src/views/copilot/yield/components/sub/ring/DoubleRingWrapper.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-30 16:00:50
- * @LastEditTime: 2024-06-03 16:26:03
+ * @LastEditTime: 2024-07-09 09:09:07
  * @LastEditors: zhp
  * @Description:
 -->
@@ -42,10 +42,11 @@ export default {
     return {
       factoryId: 4, // 默认成都
       cityOptions: [
+        "瑞昌",
         // "成都",
         "邯郸",
         // "株洲",
-        "瑞昌",
+
         // "佳木斯",
         // "凯盛光伏",
         // "蚌埠兴科",
@@ -63,7 +64,7 @@ export default {
 <style scoped lang="scss">
 .double-ring-wrapper {
   height: 100%;
-  padding: 12px 24px;
+  padding: 0px 24px;
   display: flex;
   gap: 12px;
   flex-direction: column;

src/views/copilot/yield/components/sub/ring/noDoubleRingWrapper.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-24 15:15:00
- * @LastEditTime: 2024-05-31 16:16:16
+ * @LastEditTime: 2024-07-09 09:27:12
  * @LastEditors: zhp
  * @Description:
 -->
@@ -74,7 +74,7 @@ export default {
 <style scoped lang="scss">
 .double-ring-wrapper {
   height: 100%;
-  padding: 12px 24px;
+  padding: 0px 24px;
   display: flex;
   gap: 12px;
   flex-direction: column;

src/views/copilot/yield/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-05-10 11:10:54
- * @LastEditTime: 2024-06-05 09:49:46
+ * @LastEditTime: 2024-07-09 15:09:27
  * @LastEditors: zhp
  * @Description:
 -->
@@ -20,12 +20,12 @@
       </left-container>
     </section>
     <section class="bottom flex">
-      <right-container class="fto-involve" title="FTO投入">
+      <bottom-right-container class="fto-involve" title="FTO投入">
         <fto-invest :period="period" :than="than" />
-      </right-container>
+      </bottom-right-container>
-      <left-container class="chip-involve" title="芯片投入" icon="chip">
+      <bottom-left-container class="chip-involve" title="芯片投入" icon="chip">
         <chip-invest :period="period" :than="than" />
-      </left-container>
+        </bottom-left-container>
     </section>
   </div>
 </template>
@@ -34,7 +34,8 @@
 import twoContainer from "@/views/copilot/components/twoContainer.vue";
 import leftContainer from "@/views/copilot/components/leftContainer.vue";
 import rightContainer from "@/views/copilot/components/rightContainer.vue";
-
+import bottomRightContainer from "@/views/copilot/components/bottomRightContainer.vue";
+import bottomLeftContainer from "@/views/copilot/components/bottomLeftContainer.vue";
 import StdOutput from "./components/StdOutput.vue";
 import ChipOutput from "./components/ChipOutput.vue";
 import FtoInvest from "./components/FtoInvest.vue";
@@ -45,6 +46,8 @@ export default {
   name: "YieldCopilot",
   components: {
     DbContainer: twoContainer,
+    bottomRightContainer,
+    bottomLeftContainer,
     leftContainer,
     rightContainer,
     StdOutput,

src/views/copilot/yield/options/double-ring-chart-options.js

@@ -14,15 +14,20 @@ export default ({
     top: 0,
     containLabel: true,
   },
-  tooltip: {},
+  tooltip: {
+    trigger: "item",
+    extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+    backgroundColor: '#001829',
+    borderColor: '#001829',
+  },
   title: {
     text: titleValue,
     left: "48.5%",
-    top: "37%",
+    top: "35%",
     textAlign: "center",
     textStyle: {
-      fontWeight: 600,
+      fontWeight: 400,
-      fontSize: 26,
+      fontSize: 32,
       color: "#fffd",
     },
     subtext: `\u2002${subtitle}\u2002`,
@@ -38,8 +43,8 @@ export default ({
     {
       type: "pie",
       name: "当前目标",
-     radius: ["80%", "90%"],
+      radius: ["80%", "95%"],
-      center: ["50%", "52%"],
+      center: ["50%", "48%"],
       emptyCircleStyle: {
         color: "#042c5f33",
       },
@@ -47,8 +52,8 @@ export default ({
     // 数据 series
     {
       type: "pie",
-      radius: ["80%", "90%"],
+      radius: ["80%", "95%"],
-      center: ["50%", "52%"],
+      center: ["50%", "48%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,
@@ -62,7 +67,8 @@ export default ({
           name: currentName,
           selected: false,
            tooltip: {
-            formatter: `${currentName} : ${currentSum}`
+           formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${currentName}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${currentSum}</span>`
           },
           itemStyle: {
             borderJoin: "round",
@@ -86,7 +92,8 @@ export default ({
           value:(targetSum - currentSum) === 0 ? 1 : (targetSum - currentSum),
           name: currentName,
           tooltip: {
-            formatter: `${currentName} : ${currentSum}`
+            formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${currentName}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${currentSum}</span>`
           },
           itemStyle: { color: "transparent" },
           label: { show: false },
@@ -96,8 +103,8 @@ export default ({
     // 数据 series2 - 2023累计
     {
       type: "pie",
-      radius: ["70%", "80%"],
+      radius: ["65%", "80%"],
-      center: ["50%", "52%"],
+      center: ["50%", "48%"],
       avoidLabelOvervlap: false,
       label: {
         show: false,
@@ -111,7 +118,8 @@ export default ({
           name: preName,
           selected: false,
           tooltip: {
-            formatter: `${preName} : ${previousSum}`
+             formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${preName}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${previousSum}</span>`
           },
           itemStyle: {
             borderJoin: "round",
@@ -136,7 +144,8 @@ export default ({
           value:previousSum === 0 ? 1 : 0,
           name: preName,
            tooltip: {
-            formatter: `${preName} : ${previousSum}`
+            formatter: `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${preName}</span>` +
+            `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${previousSum}</span>`
           },
           itemStyle: { color: "transparent" },
           label: { show: false },

src/views/dashboard/charts/ChipYieldChart.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-06-14 09:03:26
+ * @LastEditTime: 2024-07-08 13:43:52
  * @LastEditors: zhp
  * @Description:
 -->
@@ -53,7 +53,32 @@ export default {
           top: 0,
           containLabel: true,
         },
-        tooltip: {},
+        tooltip: {
+          trigger: "item",
+          // axisPointer: {
+          //   // type: "cross",
+          //   crossStyle: {
+          //     color: "rgba(237,237,237,0.5)",
+          //   },
+          // },
+          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+          backgroundColor: '#001829',
+          borderColor: '#001829',
+          // formatter: params => {
+          //   console.log('params', params)
+          //   var res = ``;
+          //   for (var i = 0, l = params.length; i < l; i++) {
+          //     let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
+          //     // console.log(item.color, color);
+          //     res +=
+          //       // `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${color}'></span>` +
+          //       `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${params[0].axisValueLabel}</span>` +
+          //       `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
+          //   }
+          //   console.log('res',res)
+          //   return res;
+          // },
+        },
         title: {
           text: "0%",
           left: "48%",
@@ -66,7 +91,7 @@ export default {
           },
           subtext: `\u2002${year}年累计产出\u2002`,
           subtextStyle: {
-            fontSize: 12,
+            fontSize: 15,
             fontWeight: 100,
             color: "#fffd",
             align: "right",
@@ -223,40 +248,49 @@ export default {
     actualOptions() {
       console.log('this.output.current / this.output.target', this.output.current/this.output.target);
       const year = new Date().getFullYear()
-      const options = JSON.parse(JSON.stringify(this.options));
+      const options = this.options
       // console.log('options', options);
       // 标题
-      if (!this.output.target) options.title.text = "0%";
+      if (!this.output.target && !this.output.current) options.title.text = "0%";
-      else
+      else if (!this.output.target && this.output.current) options.title.text = "100%";
-        options.title.text =
+      else options.title.text =
         ((this.output.current / this.output.target).toFixed(2)) * 100 + "%";
       // 外环
       if (
         this.output.current == this.output.target &&
         this.output.current == 0
       ) {
-        options.series[1].data[0].value = 0;
+        this.options.series[1].data[0].value = 0;
-        options.series[1].data[1].value = 1;
+        this.options.series[1].data[1].value = 1;
-        options.series[1].data[0].tooltip.formatter = year + '累计完成:0';
+        this.options.series[1].data[0].tooltip.formatter =
-        options.series[1].data[1].tooltip.formatter = year + '累计完成:0';
+          `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year + '累计完成'}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${0 + '片'}</span>`;
+        this.options.series[1].data[1].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year + '累计完成'}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${0 + '片'}</span>`;
       } else {
-        options.series[1].data[0].value = this.output.current;
+        this.options.series[1].data[0].value = this.output.current;
-        options.series[1].data[1].value =
+        this.options.series[1].data[1].value =
           this.output.target - this.output.current;
-        options.series[1].data[0].tooltip.formatter = year + '累计完成:' + this.output.current;
+        this.options.series[1].data[0].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year + '累计完成'}</span>` +
-        options.series[1].data[1].tooltip.formatter = year + '累计完成:' + this.output.current;
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${this.output.current + '片'}</span>`;
+        this.options.series[1].data[1].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year + '累计完成'}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${this.output.current + '片'}</span>`;
       }
       // 内环
       if (this.output.previous == 0) {
-        options.series[2].data[0].value = 0;
+        this.options.series[2].data[0].value = 0;
-        options.series[2].data[1].value = 1;
+        this.options.series[2].data[1].value = 1;
-        options.series[2].data[0].tooltip.formatter = year-1 + '累计完成:' + 0;
+        this.options.series[2].data[0].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year -1 + '累计完成'}</span>` +
-        options.series[2].data[1].tooltip.formatter = year-1 + '累计完成:' + 0;
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${0 + '片'}</span>`;
+        this.options.series[2].data[1].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year -1 + '累计完成'}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${0 + '片'}</span>`;
       } else {
-        options.series[2].data[0].value = this.output.previous;
+        this.options.series[2].data[0].value = this.output.previous;
-        options.series[2].data[1].value = 0;
+        this.options.series[2].data[1].value = 0;
-        options.series[2].data[0].tooltip.formatter = year - 1 + '累计完成:' + this.output.previous;
+        this.options.series[2].data[0].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year -1 + '累计完成'}</span>` +
-        options.series[2].data[1].tooltip.formatter = year - 1 + '累计完成:' + this.output.previous;
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${this.output.previous + '片'}</span>`;
+        this.options.series[2].data[1].tooltip.formatter = `<span style='display:inline-block;width:150px;color:rgba(255,255,255,0855);font-size:14px;'>${year - 1 + '累计完成'}</span>` +
+          `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${this.output.previous + '片'}</span>`;
       }
       console.log('options', options);
       return options;
@@ -274,6 +308,9 @@ export default {
     factory(val) {
       this.initOptions(this.actualOptions);
     },
+    actualOptions() {
+      this.initOptions(this.actualOptions);
+    }
   },
   mounted() {
     console.log("mounted", this.actualOptions);

src/views/dashboard/charts/LeftChartBase.vue

@@ -73,27 +73,23 @@ export default {
               color: "rgba(237,237,237,0.5)",
             },
           },
-          // backgroundColor: '#000000',
+          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
-          // textStyle: {
+          backgroundColor: '#001829',
-          //   color: '#ffff'
+          borderColor: '#001829',
-          // }
           formatter: params => {
-            // console.log(params);
+            console.log('params', params)
-            // 获取xAxis data中的数据
+            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
-            let dataStr = `<div><p style="font-weight:bold;margin:0 8px 15px;">${params[0].name}</p></div>`
+            for (var i = 0, l = params.length; i < l; i++) {
-            params.forEach(item => {
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
-              let color = item.color.colorStops ? item.color.colorStops[0].color : ''
+              // console.log(item.color, color);
-              console.log(item.color, color);
+              res +=
-              dataStr += `<div>
+                "<br/>" +
-          <div style="margin: 0 8px;">
+                `<span style='display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${color}'></span>` +
-            <span style="display:inline-block;margin-right:5px;width:10px;height:10px;background-color:${item.color.colorStops[0].color};"></span>
+                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
-            <span>${item.seriesName}</span>
+                `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
-            <span style="float:right;color:#000000;margin-left:20px;">${item.data}</span>
-          </div>
-        </div>`
-            })
-            return dataStr
             }
+            return res;
+          },
         },
         xAxis: {
           axisTick: {
@@ -141,7 +137,7 @@ export default {
           {
             name: '', // this.series[0].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             label: {
               show: true, //开启显示
               align: 'right', //在上方显示
@@ -185,7 +181,7 @@ export default {
           {
             name: '', // this.series[1].name,
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             label: {
               show: true, //开启显示
               align: 'left', //在上方显示

src/views/dashboard/charts/RightChartBase.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-28 13:42:51
- * @LastEditTime: 2024-06-28 09:28:56
+ * @LastEditTime: 2024-07-08 14:30:44
  * @LastEditors: zhp
  * @Description:
 -->
@@ -79,22 +79,27 @@ export default {
               color: "rgba(237,237,237,0.5)",
             },
           },
+          extraCssText: 'box-shadow: 0px 4px 8px 0px rgba(0, 0, 0, 0.38); border- radius: 4px;opacity: 0.6;backdrop- filter: blur(6px);',
+          backgroundColor: '#001829',
+          borderColor: '#001829',
           formatter: params => {
-            // 获取xAxis data中的数据
+            console.log('params', params)
-            let dataStr = `<div><p style="font-weight:bold;margin:0 8px 15px;">${params[0].name}</p></div>`
+            var res = `<span style='color:rgba(255,255,255,0.85)'>${params[0].axisValueLabel}</span>`;
-            params.forEach(item => {
+            for (var i = 0, l = params.length; i < l; i++) {
-              let color = Object.prototype.toString.call(item.color) == "[object String]" ? item.color : item.color.colorStops ? item.color.colorStops[0].color : ''
+              let color = Object.prototype.toString.call(params[i].color) == "[object String]" ? params[i].color : params[i].color.colorStops ? params[i].color.colorStops[0].color : ''
-              console.log(item.color, color);
+              // console.log(item.color, color);
-              dataStr += `<div>
+              res +=
-          <div style="margin: 0 8px;">
+                "<br/>" +
-            <span style="display:inline-block;margin-right:5px;width:10px;height:10px;background-color:${color};"></span>
+              `${params[i].seriesType === "line"
-            <span>${item.seriesName}</span>
+                ? '<img width="11" height="11" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
-            <span style="float:right;color:#000000;margin-left:20px;">${item.data}</span>
+                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${color}"></span>`
-          </div>
+              }` +
-        </div>`
+                `<span style='display:inline-block;width:150px;color:rgba(255,255,255,.85);font-size:14px;'>${params[i].seriesName}</span>` +
-            })
+                `<span style='color:rgba(255,255,255,0.65);font-size:14px;'>${params[i].value ? params[i].value + '片' : 0 + '片'}</span>`;
-            return dataStr
             }
+            return res;
+          },
+
         },
         xAxis: {
           axisTick: {
@@ -177,7 +182,7 @@ export default {
           {
             name: "", // "2023年",
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             itemStyle: {
               borderRadius: [10, 10, 0, 0],
               color: {
@@ -212,7 +217,7 @@ export default {
           {
             name: "", // "2024年",
             type: "bar",
-            barWidth: 12,
+            barWidth: 16,
             // tooltip: {
             //   valueFormatter: function (value) {
             //     return value + " ml";

src/views/dashboard/components/CompanyInfo.vue

@@ -96,7 +96,8 @@ h2 {
   margin: 6px 0;
   font-family: 优设标题黑;
   color: #fff;
-  letter-spacing:5px;
+  letter-spacing:4px;
+  text-align: left;
   // font-size: 24px;
   font-size: 1.276em;
 }

src/views/dashboard/components/Container.vue

@@ -90,18 +90,18 @@ export default {
   position: relative;
   box-shadow: inset 0 0 20px 1px #fff1;
 
-  // &::after {
+  &::after {
-  //   content: "";
+    content: "";
-  //   position: absolute;
+    position: absolute;
-  //   display: inline-block;
+    display: inline-block;
-  //   width: 60%;
+    width: 85%;
-  //   height: 0.31415vh;
+    height: 0.31415vh;
-  //   border-radius: 2px;
+    border-radius: 2px;
-  //   left: 8%;
+    left: 8%;
-  //   bottom: 0;
+    bottom: 0;
-  //   background: linear-gradient(to right, #024798, transparent);
+    background: linear-gradient(to left, #024798, transparent);
-  //   z-index: 0;
+    z-index: 0;
-  // }
+  }
 
   .container-head {
     // height: 40px;
@@ -112,7 +112,7 @@ export default {
     gap: 8px;
 
     .container-title {
-      font-size: 1.18vw;
+      font-size: 1vw;
       line-height: 1.39vw;
       font-weight: normal;
       letter-spacing: 2px;

src/views/dashboard/components/ContainerIcon.vue

@@ -51,8 +51,8 @@ export default {
 .container-icon {
   //   width: 32px;
   //   height: 32px;
-  width: 1.701vw;
+  width: 1.4vw;
-  height: 1.701vw;
+  height: 1.4vw;
   background: #ccc2;
 }
 </style>

src/views/dashboard/components/Header.vue

@@ -153,7 +153,7 @@ h1 {
 
 .side {
   position: absolute;
-  font-size: 1.18vw;
+  font-size: 1vw;
   // line-height: 24px;
   line-height: 1.277vw;
   letter-spacing: 2px;

src/views/dashboard/components/leftContainer.vue

@@ -0,0 +1,204 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-08 13:51:30
+ * @LastEditTime: 2024-07-08 13:53:26
+ * @LastEditors: zhp
+ * @Description:
+-->
+
+<template>
+  <div class="dashboard-container">
+    <!-- refresh btn  -->
+    <button
+      v-if="0"
+      style="appearance: none; outline: none; border: none; background: none; color:#fff; cursor: pointer; 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"
+        />
+      </svg>
+    </button>
+    <!-- decoration  -->
+    <div class="corner tl"></div>
+    <div class="corner tr"></div>
+    <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 style="margin-left: 16px;" :icon="icon"></Icon>
+      <h2 class="container-title">{{ title }}</h2>
+    </div>
+    <div
+      class="container-body"
+      :class="[
+        side == 'left' ? 'body-gradient-to-right' : 'body-gradient-to-left',
+      ]"
+    >
+      <slot />
+    </div>
+  </div>
+</template>
+
+<script>
+import ContainerIconVue from "./ContainerIcon.vue";
+export default {
+  name: "DashboardContainer",
+  components: {
+    Icon: ContainerIconVue,
+  },
+  props: {
+    side: {
+      type: String,
+      default: "left",
+    },
+    icon: {
+      type: String,
+      default: "cube",
+    },
+    title: {
+      type: String,
+      default: "Default Title",
+    },
+  },
+  data() {
+    return {};
+  },
+  computed: {},
+  methods: {},
+};
+</script>
+
+<style scoped lang="scss">
+.dashboard-container {
+  height: 0;
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  position: relative;
+  box-shadow: inset 0 0 20px 1px #fff1;
+
+  &::after {
+    content: "";
+    position: absolute;
+    display: inline-block;
+    width: 85%;
+    height: 0.31415vh;
+    border-radius: 2px;
+    left: 8%;
+    bottom: 0;
+    background: linear-gradient(to right, #024798, transparent);
+    z-index: 0;
+  }
+
+  .container-head {
+    // height: 40px;
+    height:4vh;
+    padding: 8px;
+    display: flex;
+    align-items: center;
+    gap: 8px;
+
+    .container-title {
+      font-size: 1vw;
+      line-height: 1.39vw;
+      font-weight: normal;
+      letter-spacing: 2px;
+    }
+  }
+
+  .container-body {
+    padding: 12px;
+    display: flex;
+    flex-direction: column;
+    flex: 1;
+    height: 0;
+  }
+
+  .corner {
+    z-index: 1;
+    position: absolute;
+    // width: 16px;
+    // height: 16px;
+    width: 0.95vw;
+    height: 0.95vw;
+  }
+
+  .corner.tl {
+    border-top: 2px solid #0175dc;
+    border-left: 2px solid #0175dc;
+    top: 0;
+    left: 0;
+  }
+
+  .corner.tr {
+    top: 0;
+    right: 0;
+    border-top: 2px solid #0175dc;
+    border-right: 2px solid #0175dc;
+  }
+
+  .corner.bl {
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    bottom: 0;
+    left: 0;
+    // border-left: 10px solid #0175dc;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid transparent;
+    border-left: 0.532vw solid #0175dc;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid transparent;
+  }
+
+  .corner.br {
+    bottom: 0;
+    right: 0;
+    // width: 20px;
+    // height: 20px;
+    width: 1.064vw;
+    height: 1.064vw;
+    // border-left: 10px solid transparent;
+    // border-bottom: 10px solid #0175dc;
+    // border-top: 10px solid transparent;
+    // border-right: 10px solid #0175dc;
+    border-left: 0.532vw solid transparent;
+    border-bottom: 0.532vw solid #0175dc;
+    border-top: 0.532vw solid transparent;
+    border-right: 0.532vw solid #0175dc;
+  }
+
+  .gradient-to-right {
+    background: linear-gradient(to right, #0c3f68cc, transparent);
+  }
+
+  .gradient-to-left {
+    background: linear-gradient(to left, #0c3f68cc, transparent);
+  }
+
+  .body-gradient-to-right {
+    background: linear-gradient(to right, #0003, transparent);
+  }
+
+  .body-gradient-to-left {
+    background: linear-gradient(to left, #0003, transparent);
+  }
+}
+</style>

src/views/index.vue

@@ -17,12 +17,12 @@
         <db-header class="db-header"></db-header>
         <div class="db-body">
           <div class="db-left">
-            <db-container icon="cube" title="FTO投入" @refresh="() => (ftoKey = Math.random())">
+            <left-container icon="cube" title="FTO投入" @refresh="() => (ftoKey = Math.random())">
               <fto-chart :key="ftoKey" />
-            </db-container>
+            </left-container>
-            <db-container icon="chip2" title="芯片投入" @refresh="() => (chipInvestKey = Math.random())">
+            <left-container icon="chip2" title="芯片投入" @refresh="() => (chipInvestKey = Math.random())">
               <chip-invest-chart :key="chipInvestKey" />
-            </db-container>
+            </left-container>
           </div>
           <div class="db-right">
             <db-container side="right" icon="chip" title="芯片产出" @refresh="() => (chipYieldKey = Math.random())">
@@ -53,6 +53,7 @@ import store from "@/store";
 import DashboardHeader from "./dashboard/components/Header.vue";
 import CompanyInfo from "./dashboard/components/CompanyInfo.vue";
 import Container from "./dashboard/components/Container.vue";
+import leftContainer from "./dashboard/components/leftContainer.vue";
 import FtoChart from "./dashboard/charts/Fto.vue";
 import ChipInvestChart from "./dashboard/charts/ChipInvest.vue";
 import BipvChart from "./dashboard/charts/Bipv.vue";
@@ -84,6 +85,7 @@ export default {
   name: "Index",
   components: {
     CompanyInfo,
+    leftContainer,
     ksCompanyInfo: CompanyInfo,
     hdCompanyInfo: CompanyInfo,
     bbCompanyInfo: CompanyInfo,
@@ -340,7 +342,7 @@ export default {
   .db-left,
   .db-right {
     // width: 420px;
-    width: 24vw;
+    width: 24.5vw;
     padding: 20px;
     display: flex;
     flex-direction: column;

src/views/produce/data/add-or-updata.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-06-26 13:39:22
+ * @LastEditTime: 2024-07-05 13:28:38
- * @LastEditors: DY
+ * @LastEditors: zhp
  * @Description:
 -->
 <template>
@@ -45,7 +45,7 @@
           </el-col>
           <el-col :span="6">
             <p class="title">芯片总功率(MW)</p>
-            <p class="text">{{ dataForm.chipTotalPower }}</p>
+            <p class="text">{{ dataForm.chipTotalPower.toFixed(2) }}</p>
           </el-col>
         </el-row>
         <el-row :gutter="24">
@@ -73,7 +73,7 @@
           </el-col>
           <el-col :span="6">
             <p class="title">芯片产能利用率(%)</p>
-            <p class="text">{{ dataForm.chipCapacityUtilizationRate }}</p>
+            <p class="text">{{ parseFloat(dataForm.chipCapacityUtilizationRate.toFixed(2)) }}</p>
           </el-col>
         </el-row>
       </div>
@@ -102,11 +102,11 @@
         <el-row :gutter="24">
           <el-col :span="6">
             <p class="title">标准组件总功率(MW)</p>
-            <p class="text">{{ dataForm.componentTotalPower }}</p>
+            <p class="text">{{ parseFloat(dataForm.componentTotalPower.toFixed(2)) }}</p>
           </el-col>
           <el-col :span="6">
             <p class="title">封装产能利用率(%)</p>
-            <p class="text">{{ dataForm.componentCapacityUtilizationRate }}</p>
+            <p class="text">{{ parseFloat(dataForm.componentCapacityUtilizationRate.toFixed(2)) }}</p>
           </el-col>
           <el-col :span="6">
             <p class="title">标准组件人均产量(片/人)</p>

src/views/produce/data/index.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-02 16:33:59
+ * @LastEditTime: 2024-07-16 17:47:40
  * @LastEditors: DY
  * @Description:
 -->
@@ -10,22 +10,22 @@
     <div class="app-container" style="padding: 16px 24px 0; height: auto; flex-grow: 1;">
       <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
         <el-form-item label="时间维度" prop="type">
-          <el-select v-model="listQuery.type" size="small" clearable placeholder="请选择">
+          <el-select @change="changType" v-model="listQuery.type" size="small" clearable placeholder="请选择">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
             </el-option>
           </el-select>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
           <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期" :picker-options="{  }">
+            start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime" end-placeholder="结束日期" :picker-options="{ firstDayOfWeek: 1 }">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy 第 WW 周" placeholder="选择周"
+          <el-date-picker size="small" clearable v-model="listQuery.start" type="week" format="yyyy-MM-dd" placeholder="选择周" :picker-options="{ firstDayOfWeek: 1 }"
             style="width: 180px" @change="onValueChange">
           </el-date-picker>
           至
-          <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy 第 WW 周" placeholder="选择周"
+          <el-date-picker size="small" clearable v-model="listQuery.end" type="week" format="yyyy-MM-dd" placeholder="选择周" :picker-options="{ firstDayOfWeek: 1 }"
             style="width: 180px" @change="onValueChange">
           </el-date-picker>
           <!-- <span v-if="listQuery.start && listQuery.end" style="margin-left: 10px">
@@ -115,7 +115,7 @@ import moment from 'moment'
 import ButtonNav from '@/components/ButtonNav'
 import basicPage from '@/mixins/basic-page'
 import AddOrUpdate from './add-or-updata'
-import { factoryList, factoryArray, factoryArray1 } from "@/utils/constants";
+import { factoryList, factoryArray, factoryListabbr } from "@/utils/constants";
 
 export default {
   components: { lineChart, ButtonNav, AddOrUpdate },
@@ -124,7 +124,7 @@ export default {
     return {
       factoryList,
       factoryArray,
-      factoryArray1,
+      factoryListabbr,
       listQuery: {
         pageSize: 20,
         pageNo: 1,
@@ -253,7 +253,7 @@ export default {
   // },
   created() {
     const today = new Date()
-    const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
+    const sevenDaysAgo = new Date(today.getTime() - (6 * 24 * 60 * 60 * 1000))
     this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD')
     this.listQuery.endDate = moment(today).format('yyyy-MM-DD')
     this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate]
@@ -261,6 +261,11 @@ export default {
 	mounted() {
 	},
   methods: {
+    changType() {
+      this.listQuery.endDate = null
+      this.listQuery.startDate = null
+      this.listQuery.reportTime = null
+    },
     otherMethods(val) {
       this.detailOrUpdateVisible = true;
       this.addOrEditTitle = "详情";
@@ -354,7 +359,7 @@ export default {
         this.$message.warning('请选择时间维度！')
         return
       }
-      if (this.listQuery.startDate === undefined) {
+      if (!this.listQuery.startDate) {
         this.$message.warning('请选择时间范围！')
       } else {
         await getProduceDataPage(this.listQuery).then(res => {
@@ -364,7 +369,6 @@ export default {
             this.listQuery.total = res.data.total
           }
         })
-
         // 图表
         await getproddata(this.listQuery).then(resp => {
           if (resp.data?.length > 0) {
@@ -382,94 +386,71 @@ export default {
       // x轴数据
       xAxisData = Object.keys(data)
 
-      // y轴数据
+      // 构造series
-      this.factoryArray.forEach(fac => {
+      // 玻璃类型 ['chipYield', 'componentYield', 'bipvProductOutput']
-        let i =  0
+      const typeArray = (this.listQuery.glass.length === 0 || this.listQuery.glass.length === 3) ? [0, 1, 2] : this.listQuery.glass
-        while ( i < 3) {
+      // 工厂名称 this.factoryListabbr
-          // 下标
+      const factoryNameArray = (this.listQuery.factory.length === 0 || this.listQuery.factory.length === this.factoryListabbr.length) ? [0, 1] : this.listQuery.factory
-          const index1 = ['chipYield', 'componentYield', 'bipvProductOutput'][i]
+      const seriesArray = []
-          // let oneChart = {}
+      typeArray.forEach((type, typeIndex) => {
-          xAxisData.forEach((x, index) => {
+        factoryNameArray.forEach((fac, facIndex) => {
-            if (this.listQuery.glass.length === 0 || this.listQuery.glass.length === 3) {
+          const series = {
-              let series = {
-                name: ['玻璃芯片', '标准组件', 'BIPV'][i] + '-' + fac.id,
-                type: 'bar',
-                stack: String(fac.id),
             data: Array(xAxisData.length).fill(0),
-                barWidth: 20,
+            type: 'bar',
+            stack: String(fac),
+            barWidth: 16,
             itemStyle: {
-                  color: this.colorList[i]
+              color: this.colorList[type]
             },
-                label: {
+            name: this.factoryListabbr[fac] + '-' + type
-                  show: i === 2 ? true : false,
-                  position: 'top',
-                  formatter(params) {
-                    return fac.name.substring(0, 2)
-                  }
-                }
-              }
-              dataList.forEach(item => {
-                if (fac.id === item.factory && item.datestr === x) {
-                  series.data[index] = item[index1]
           }
+          seriesArray.push(series)
         })
-              this.seriesList.push(series)
+      })
-            } else {
+      // 构造series的data
-              this.listQuery.glass.forEach(gl => {
+      const seriesDataArray = []
-                if (gl === i) {
+      Object.values(data).forEach((item) => {
-                  let series = {
+        let seriesData = []
-                    name: ['玻璃芯片', '标准组件', 'BIPV'][i] + '-' + fac.id,
+        // item[0].datestr 为日期
-                    type: 'bar',
+        typeArray.forEach(t => {
-                    stack: String(fac.id),
+          const zidr = ['chipYield', 'componentYield', 'bipvProductOutput'][t]
+          item.forEach(it => {
+            seriesData.push(it[zidr]) 
+          })
+        })
+        seriesDataArray.push(seriesData)
+      })
+      for (let y = 0; y < seriesArray.length; y ++) {
+        const days = []
+        seriesDataArray.forEach(a => {
+          days.push(a[y])
+        })
+        // 赋值完成
+        seriesArray[y].data = days
+      }
+
+      // 添加工厂
+      const validSeriesArray = []
+      factoryNameArray.forEach(f => {
+        const s = {
+          name: '显示工厂',
           data: Array(xAxisData.length).fill(0),
-                    barWidth: 20,
+          type: 'bar',
-                    itemStyle: {
+          stack: String(f),
-                      color: this.colorList[i]
+          barWidth: 16,
-                    },
           label: {
             show: true,
             position: 'top',
+            // position: f > 0 ?  [2, -16] : [-10, -16],
             formatter(params) {
-                        if (params.value === 0) {
+              return factoryListabbr[f]
-                          return ''
-                        } else {
-                          // return ['瑞昌', '邯郸'][params.seriesName.split('-')[1]]
-                          return fac.name.substring(0, 2)
             }
           }
         }
-                  }
+        validSeriesArray.push(s)
-                  dataList.forEach(item => {
-                    if (fac.id === item.factory && item.datestr === x) {
-                      series.data[index] = item[index1]
-                    }
       })
-                  this.seriesList.push(series)
+      this.seriesList = [...seriesArray, ...validSeriesArray]
-                }
+      this.$refs.lineChart.initChart(xAxisData, this.seriesList, factoryNameArray)
-              })
-            }
-            // let series = {
-            //   name: ['玻璃芯片', '标准组件', 'BIPV'][i] + '-' + fac.id,
-            //   type: 'bar',
-            //   stack: String(fac.id),
-            //   data: Array(xAxisData.length).fill(0),
-            //   barWidth: 20,
-            //   itemStyle: {
-            //     color: this.colorList[i]
-            //   }
-            // }
-            // dataList.forEach(item => {
-            //   if (fac.id === item.factory && item.datestr === x) {
-            //     series.data[index] = item[index1]
-            //   }
-            // })
-            // this.seriesList.push(series)
-          })
-          i ++
-        }
-      })
-      console.log('你好', this.seriesList)
-      this.$refs.lineChart.initChart(xAxisData, this.seriesList)
     },
 		buttonClick(val) {
 			this.listQuery.reportTime = val.reportTime ? val.reportTime : undefined;

src/views/produce/data/lineChart.vue

@@ -2,7 +2,7 @@
  * @Author: zwq
  * @Date: 2022-01-21 14:43:06
  * @LastEditors: DY
- * @LastEditTime: 2024-07-01 16:54:41
+ * @LastEditTime: 2024-07-16 18:41:27
  * @Description:
 -->
 <template>
@@ -73,7 +73,7 @@ export default {
     this.chart = null
   },
   methods: {
-    initChart(xAxis, seriesList) {
+    initChart(xAxis, seriesList, facs) {
       if (xAxis.length === 0) {
         this.chart.clear()
       }
@@ -93,9 +93,9 @@ export default {
           itemHeight: 10,
           itemGap: 40,
           formatter(name) {
-            return name.split('-')[0]
+            return ['玻璃芯片', '标准组件', 'BIPV'][name.split('-')[1]]
           },
-          data: ['玻璃芯片-0', '标准组件-0', 'BIPV-0']
+          data: ['瑞昌-0', '瑞昌-1', '瑞昌-2']
         },
         tooltip: {
           trigger: 'axis',
@@ -103,37 +103,37 @@ export default {
             type: 'shadow',
             color: "rgba(237,237,237,0.5)"
           },
-          formatter: function(params) {
+          formatter(params) {
+            let str = ''
+            facs.forEach(ele => {
+              str += `<div style="width: 60px; text-align: right">${ factoryListabbr[ele] }</div>`
+            })
             let result = `
             <div style="width: 270px; display: flex">
               <div style="width: 150px">${params[0].name}</div>
-              <div style="width: 60px; text-align: right">${factoryListabbr[0]}</div>
+              ${ str }
-              <div style="width: 60px; text-align: right">${factoryListabbr[1]}</div>
             </div>`
-            const newArray = params.map(p => {
+            const analyzeArray = params.filter(p => p.seriesName !== '显示工厂').map(item => {
-              return {
+              const obj = {
-                glass: p.seriesName.split('-')[0], // 玻璃类型
+                glass: ['玻璃芯片', '标准组件', 'BIPV'][item.seriesName.split('-')[1]], // 玻璃类型
-                factoryName: factoryListabbr[p.seriesName.split('-')[1]], // 工厂名称
+                factoryName: item.seriesName.split('-')[0], // 工厂名称
-                value: p.value,
+                value: item.value,
-                name: p.name,
+                name: item.name,
-                marker: p.marker,
+                marker: item.marker,
-                color: p.color
+                color: item.color
               }
+              return obj
             })
-            const analyzeList = Object.groupBy(newArray, (member) => member.glass)
+            const analyzeList = Object.groupBy(analyzeArray, (member) => member.glass)
             for (let g in analyzeList) {
               // date => 玻璃类型
               let oneData = `<div style="width: 270px; display: flex">
               <div style="width: 150px; display: flex; align-items: center">
               <div style="background-color: ${analyzeList[g][0].color}; width: 10px; height: 10px; margin-right: 5px"></div>
               <div>${g}</div></div>`
-              for (let fac of factoryListabbr) {
                 let goodNum = 0
               for (let ana of analyzeList[g]) {
-                  if (ana.factoryName === fac && ana.value !== 0) {
                 goodNum = ana.value
-                  }
-                }
                 oneData += `<div style="width: 60px; text-align: right">${goodNum}</div>`
               }
               result = result + oneData + '</div>'
@@ -156,7 +156,7 @@ export default {
         yAxis: [
           {
             type: 'value',
-            name: '单位：个'
+            name: '单位：片'
           }
         ],
         grid: {

src/views/produce/workOrder/add-or-updata.vue

@@ -1,15 +1,15 @@
 <!--
  * @Author: zhp
  * @Date: 2023-11-06 15:15:30
- * @LastEditTime: 2024-06-27 14:50:21
+ * @LastEditTime: 2024-07-08 15:06:49
- * @LastEditors: DY
+ * @LastEditors: zhp
  * @Description:
 -->
 <template>
   <el-drawer class="drawer" :visible.sync="visible" size="85%" @closed="$emit('destroy')">
     <small-title slot="title" :no-padding="true">
       {{ '详情' }}
-      <el-button type="primary" plain size="small" style="float: right" @click="exportDetail">导出</el-button>
+      <!-- <el-button type="primary" plain size="small" style="float: right" @click="exportDetail">导出</el-button> -->
     </small-title>
     <div ref="detail" class="detailBox">
       <el-row :gutter="20">
@@ -69,14 +69,19 @@
         </el-col>
         <el-col :span="3">
           <p class="title">开始时间</p>
-          <p class="text">{{ dataForm.startDate?.length > 0 ? dataForm.startDate[0] + '-' + dataForm.startDate[1] + '-' + dataForm.startDate[2] : '' }}</p>
+          <p class="text">{{ dataForm.startDate?.length > 0 ? dataForm.startDate[0] + '-' + dataForm.startDate[1] + '-'
+            + dataForm.startDate[2] : '' }}</p>
         </el-col>
         <el-col :span="3">
           <p class="title">完成时间</p>
-          <p class="text">{{ dataForm.endDate?.length > 0 ? dataForm.endDate[0] + '-' + dataForm.endDate[1] + '-' + dataForm.endDate[2] : '' }}</p>
+          <p class="text">{{ dataForm.endDate?.length > 0 ? dataForm.endDate[0] + '-' + dataForm.endDate[1] + '-' +
+            dataForm.endDate[2] : '' }}</p>
         </el-col>
       </el-row>
-      <div style="width: 100%; padding: 0 32px"><el-divider style="margin: 0"></el-divider></div>
+      <div v-loading="loading">
+        <div style="width: 100%; padding: 0 32px">
+          <el-divider style="margin: 0"></el-divider>
+        </div>
         <el-row :gutter="0" style="margin: 20px 32px">
           <el-col :span="8">
             <div>
@@ -89,13 +94,15 @@
           <el-col :span="16">
             <div style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
               <small-title slot="title" :no-padding="true">
-              历史趋势
+                待制品分布
               </small-title>
-            <div ref="line" v-show="dataForm.orderStatus === 2" :style="{ height: '40vh', width: '50vw' }" />
+              <div ref="equipmentLine" :style="{ height: '40vh', width: '50vw' }" />
             </div>
           </el-col>
         </el-row>
-      <div style="width: 100%; padding: 0 32px"><el-divider style="margin: 0"></el-divider></div>
+        <div style="width: 100%; padding: 0 32px">
+          <el-divider style="margin: 0"></el-divider>
+        </div>
         <el-row :gutter="0" style="margin: 20px 32px">
           <el-col :span="8">
             <div>
@@ -106,15 +113,17 @@
             </div>
           </el-col>
           <el-col :span="16">
-          <div style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
+            <div v-show="dataForm.orderStatus === 2"
+              style="border-left: 1px solid #d1d3d8; width: 100%; padding-left: 32px">
               <small-title slot="title" :no-padding="true">
-              待制品分布
+                历史趋势
               </small-title>
-            <div ref="equipmentLine" :style="{ height: '40vh', width: '50vw' }" />
+              <div ref="line" :style="{ height: '40vh', width: '50vw' }" />
             </div>
           </el-col>
         </el-row>
       </div>
+    </div>
   </el-drawer>
 
 </template>
@@ -147,6 +156,7 @@ export default {
       barChart: null,
       equipmentLineChart: null,
       visible: false,
+      loading:true,
       dataForm: {},
       colorList: ['#3E8EF7', '#69E6D8', '#F7C739'] // pie颜色
     }
@@ -193,12 +203,13 @@ export default {
     },
     init(id) {
       this.visible = true
-      this.$nextTick(() => {
+      // this.$nextTick(() => {
-        this.initLineChart()
+      //   this.initLineChart()
-      })
+      // })
       if (id) {
         getWorkOrderDetail(id).then(res => {
           if (res.code === 0) {
+            this.loading = false
             this.dataForm = res.data.prodWorkOrderDO
             this.buildChart(this.dataForm)
             // 在制品
@@ -248,9 +259,9 @@ export default {
       this.initChart(barList)
       // 良品率
       const pieList = [
-        { value: data.actualProduction, name: '实际产出' },
+        { value: data.actualProduction ? data.actualProduction : 0, name: '实际产出' },
-        { value: data.wasteNum, name: '废品数量' },
+        { value: data.wasteNum ? data.wasteNum : 0, name: '废品数量' },
-        { value: data.reworkNum, name: '待再加工数量' }
+        { value: data.reworkNum ? data.reworkNum :0, name: '待再加工数量' }
       ]
       this.initPieChart(pieList)
     },
@@ -266,11 +277,11 @@ export default {
         tooltip: {
           trigger: 'axis'
         },
-        grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        // grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
         calculable: true,
         grid: {
           top: '15%',
-          left: 0,
+          left: 20,
           right: '10%',
           bottom: 0,
           containLabel: true
@@ -293,7 +304,7 @@ export default {
           {
             data: barData,
             type: 'bar',
-            barWidth: '40%',
+            barWidth: 16,
             label: {
               show: true,
               position: 'top'
@@ -328,7 +339,14 @@ export default {
             label: {
               show: true,
               position: 'outside',
-              formatter: '{d|{d}%} \n {b|{b}}',
+              formatter: (params) => {
+                console.log(params)
+                let res = ''
+                // for (let i in params) {
+                  res += `${params.percent ? params.percent : 0}% \n ${params.name}`
+                // }
+                return res
+              },
               rich: {
                 d: {
                   color: 'inherit', // 系列色
@@ -356,11 +374,11 @@ export default {
         tooltip: {
           trigger: 'axis'
         },
-        grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        // grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
         calculable: true,
         grid: {
           top: '15%',
-          left: 0,
+          left: 30,
           right: 0,
           bottom: 0,
           containLabel: true
@@ -384,7 +402,7 @@ export default {
           {
             data: yAxisList,
             type: 'bar',
-            barWidth: '50%',
+            barWidth: 16,
             label: {
               show: true,
               position: 'top'

src/views/produce/workOrder/dayReportComponents/ExportDayReport.vue

@@ -0,0 +1,127 @@
+<template>
+  <div class="dayRepExpBox">
+    <el-row>
+      <el-col :span="24">
+        <div class="chartTitle" style="text-align: center;">产品良率</div>
+        <div class="box2">
+          <productYield ref="productYield" :pieList="pieList" />
+        </div>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <div class="chartTitle" style="text-align: center;">待制品分布</div>
+        <div class="box2">
+          <beProcessed ref="beProcess" :beProcessObj="beProcessObj" />
+        </div>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <div class="chartTitle" style="text-align: center;">生产明细</div>
+        <div class="box2">
+          <produceDetail ref="produceDetail" :produceData="produceData" />
+        </div>
+      </el-col>
+    </el-row>
+    <el-row>
+      <el-col :span="24">
+        <div class="chartTitle" style="text-align: center;">历史趋势</div>
+        <div class="box2">
+          <hisChart ref="hisChart" :hisObj="hisObj" />
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+<script>
+import hisChart from './dayReportExportChart/hisChart'
+import produceDetail from './dayReportExportChart/produceDetail'
+import productYield from './dayReportExportChart/productYield'
+import beProcessed from './dayReportExportChart/beProcessed.vue'
+export default {
+  name: 'ExportDayReport',
+  components: { hisChart, produceDetail, productYield, beProcessed },
+  props: {
+    produceData: {
+      type: Array,
+      default: () => []
+    },
+    hisObj: {
+      type: Object,
+      default: () => { }
+    },
+    pieList: {
+      type: Array,
+      default: () => []
+    },
+    beProcessObj: {
+      type: Object,
+      default: () => {}
+    },
+  },
+  data() {
+    return {
+    }
+  },
+  watch: {
+    beProcessObj: {
+      handler(newValue, oldValue) {
+        this.$refs.beProcess.canvasReset()
+      }
+    }
+  },
+  mounted() {
+    this.getData()
+  },
+  methods: {
+    getData() {
+      // console.log('beProcessObj', this.beProcessObj);
+      // this.$refs.beProcess.canvasReset()
+      // this.$refs.productYield.canvasReset()
+      // this.$refs.produceDetail.canvasReset()
+      // this.$refs.hisChart.canvasReset()
+
+    }
+  }
+}
+</script>
+<style lang='scss' scoped>
+.dayRepExpBox {
+  width: 595px;
+  height: 842px;
+  padding: 15px 20px 0;
+  background-color: #fff;
+  z-index: 2000;
+  .box2{
+    width: 555px;
+    height: 200px;
+    border: 2px solid #ECECEC;
+    border-left: 0;
+  }
+  .box3{
+    width: 555px;
+    height: 200px;
+    border: 2px solid #ECECEC;
+  }
+  .box5{
+    width: 555px;
+    height: 200px;
+    border: 2px solid #ECECEC;
+    border-left: 0;
+  }
+  .box6{
+    width: 555px;
+    height: 200px;
+    border: 2px solid #ECECEC;
+    position: relative;
+    .rightTitle{
+      position: absolute;
+      right: 5px;
+      top:2px;
+      font-size: 8px;
+      color: #383838;
+    }
+  }
+}
+</style>

src/views/produce/workOrder/dayReportComponents/dayReportExportChart/beProcessed.vue

@@ -0,0 +1,103 @@
+<template>
+  <div id="chipPowerExpChart" style="width:552px;height:200px;" />
+</template>
+<script>
+import * as echarts from 'echarts'
+// import resize from './../../../mixins/resize'
+import { debounce } from "@/utils/debounce";
+export default {
+  name: 'ChipPowerExp',
+  // mixins: [resize],
+  props: {
+    beProcessObj: {
+      type: Object,
+      default: () => { }
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    beProcessObj: {
+      handler(val) {
+        console.log(val);
+        this.canvasReset()
+      },
+      deep: true //对象内部属性的监听，关键。
+    }
+  },
+  mounted() {
+    this.canvasReset()
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.updateChart();
+      }, 500)();
+    },
+    updateChart() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose()
+      }
+      console.log(this.beProcessObj);
+      this.chart = echarts.init(document.getElementById('chipPowerExpChart'))
+      // const legendName = Object.keys(this.chipPowerDistributionVo)
+      let xAxisList = this.beProcessObj.xAxisList
+      let yAxisList = this.beProcessObj.yAxisList
+      var option = {
+        // title: {
+        //   text: '待制品分布',
+        //   left: 'center'
+        //   // subtext: 'Fake Data'
+        // },
+        color: ['#3E8EF7'],
+        tooltip: {
+          trigger: 'axis'
+        },
+        // grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        calculable: true,
+        grid: {
+          top: '15%',
+          left: 0,
+          right: 0,
+          bottom: 0,
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: xAxisList,
+          axisLabel: {
+            rotate: 45
+            // width: '10%'
+          }
+        },
+        yAxis: {
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
+        },
+        series: [
+          {
+            data: yAxisList,
+            type: 'bar',
+            barWidth: 10,
+            label: {
+              show: true,
+              position: 'top'
+            }
+          }
+        ]
+      }
+      option && this.chart.setOption(option)
+    }
+  }
+}
+</script>

src/views/produce/workOrder/dayReportComponents/dayReportExportChart/hisChart.vue

@@ -0,0 +1,108 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-08 14:51:47
+ * @LastEditTime: 2024-07-09 09:55:27
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div id="hisChart" style="width:552px;height:200px;" />
+</template>
+<script>
+import * as echarts from 'echarts'
+// import resize from './../../../mixins/resize'
+import { debounce } from "@/utils/debounce";
+export default {
+  name: 'ChipPowerExp',
+  // mixins: [resize],
+  props: {
+    hisObj: {
+      type: Object,
+      default: () => { }
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    hisObj: {
+      handler(newValue, oldValue) {
+        this.canvasReset()
+      },
+      deep:true,
+    }
+  },
+  mounted() {
+    this.canvasReset()
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.updateChart();
+      }, 500)();
+    },
+    updateChart() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose()
+      }
+      this.chart = echarts.init(document.getElementById('hisChart'))
+      // const legendName = Object.keys(this.chipPowerDistributionVo)
+      // const values = Object.values(this.chipPowerDistributionVo)
+      let dateList = this.hisObj.dateList
+      let seriesList = this.hisObj.seriesList
+      var option = {
+        // title: {
+        //   text: '待制品分布',
+        //   left: 'center'
+        //   // subtext: 'Fake Data'
+        // },
+        color: ['#3E8EF7'],
+        tooltip: {
+          trigger: 'axis'
+        },
+        // grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        calculable: true,
+        grid: {
+          top: '15%',
+          left: 0,
+          right: 0,
+          bottom: 0,
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: dateList,
+          axisLabel: {
+            rotate: 45
+            // width: '10%'
+          }
+        },
+        yAxis: {
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
+        },
+        series: [
+          {
+            data: seriesList,
+            type: 'line',
+            label: {
+              show: true,
+              position: 'top'
+            }
+          }
+        ]
+      }
+      option && this.chart.setOption(option)
+    }
+  }
+}
+</script>

src/views/produce/workOrder/dayReportComponents/dayReportExportChart/produceDetail.vue

@@ -0,0 +1,107 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-08 14:51:47
+ * @LastEditTime: 2024-07-09 09:56:13
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div id="produceDetail" style="width:552px;height:200px;" />
+</template>
+<script>
+import * as echarts from 'echarts'
+// import resize from './../../../mixins/resize'
+import { debounce } from "@/utils/debounce";
+export default {
+  name: 'ChipPowerExp',
+  // mixins: [resize],
+  props: {
+    produceData: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    produceData: {
+      handler(newValue, oldValue) {
+        this.canvasReset()
+      },
+      deep:true,
+    }
+  },
+  mounted() {
+    this.canvasReset()
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.updateChart();
+      }, 500)();
+    },
+    updateChart() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose()
+      }
+      this.chart = echarts.init(document.getElementById('produceDetail'), null, { devicePixelRatio: 2 })
+      // const legendName = Object.keys(this.chipPowerDistributionVo)
+
+      // const values = Object.values(this.chipPowerDistributionVo)
+      var option = {
+        // title: {
+        //   text: '生产明细',
+        //   left: 'center'
+        //   // subtext: 'Fake Data'
+        // },
+        color: ['#3E8EF7'],
+        tooltip: {
+          trigger: 'axis'
+        },
+        // grid: { top: 100, right: 90, bottom: 10, left: 10, containLabel: true },
+        calculable: true,
+        grid: {
+          top: '15%',
+          left: 0,
+          right: '10%',
+          bottom: 0,
+          containLabel: true
+        },
+        xAxis: {
+          type: 'category',
+          data: ['目标产量', '计划投入量', '实际投入', '实际产出', '废品数量', '待再加工数量'],
+          axisLabel: {
+            rotate: 45
+          }
+        },
+        yAxis: {
+          type: 'value',
+          name: '单位/片',
+          axisLine: {
+            show: true
+          }
+        },
+        series: [
+          {
+            data: this.produceData,
+            type: 'bar',
+            barWidth: 16,
+            label: {
+              show: true,
+              position: 'top'
+            }
+          }
+        ]
+      }
+      option && this.chart.setOption(option)
+    }
+  }
+}
+</script>

src/views/produce/workOrder/dayReportComponents/dayReportExportChart/productYield.vue

@@ -0,0 +1,109 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-08 14:51:47
+ * @LastEditTime: 2024-07-11 14:48:15
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div id="productYield" style="width:552px;height:200px;" />
+</template>
+<script>
+import * as echarts from 'echarts'
+// import resize from './../../../mixins/resize'
+import { debounce } from "@/utils/debounce";
+export default {
+  name: 'ChipPowerExp',
+  // mixins: [resize],
+  props: {
+    pieList: {
+      type: Array,
+      default: () => []
+    }
+  },
+  data() {
+    return {
+      chart: null
+    }
+  },
+  watch: {
+    pieList: {
+      handler(newValue, oldValue) {
+        this.canvasReset()
+      },
+      deep:true
+    }
+  },
+  mounted() {
+    this.canvasReset()
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.updateChart();
+      }, 500)();
+    },
+    updateChart() {
+      if (
+        this.chart !== null &&
+        this.chart !== '' &&
+        this.chart !== undefined
+      ) {
+        this.chart.dispose()
+      }
+      console.log(this.beProcessObj);
+      this.chart = echarts.init(document.getElementById('productYield'), null, { devicePixelRatio: 2 })
+      // const values = Object.values(this.chipPowerDistributionVo)
+      var option = {
+        color: ['#3E8EF7', '#69E6D8', '#F7C739'],
+        title: {
+          // text: !isNaN((pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100) ? ( '产品良率 ' + (pieData[0].value / (pieData[0].value + pieData[1].value)).toFixed(4) * 100 + '%') : '产品良率 -',
+          left: 'center'
+          // subtext: 'Fake Data'
+        },
+        tooltip: {
+          trigger: 'item'
+        },
+        legend: {
+          bottom: 0,
+          left: 'center',
+          itemGap:60,
+        },
+        series: [
+          {
+            // name: 'Access From',
+            type: 'pie',
+            center: ['50%', '45%'],
+            radius: ['50%', '70%'],
+            avoidLabelOverlap: false,
+            data: this.pieList,
+            label: {
+              show: true,
+              position: 'outside',
+              formatter: (params) => {
+                console.log(params)
+                let res = ''
+                // for (let i in params) {
+                res += `${params.percent ? params.percent : 0}% \n ${params.name}`
+                // }
+                return res
+              },
+              rich: {
+                d: {
+                  color: 'inherit', // 系列色
+                  verticalAlign: 'top'
+                },
+                b: {
+                  color: '#8C8C8C',
+                  verticalAlign: 'top'
+                }
+              }
+            }
+          }
+        ]
+      }
+      option && this.chart.setOption(option)
+    }
+  }
+}
+</script>

src/views/produce/workOrder/index.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-01 17:06:29
+ * @LastEditTime: 2024-07-09 11:08:43
- * @LastEditors: DY
+ * @LastEditors: zhp
  * @Description:
 -->
 <template>
@@ -33,7 +33,8 @@
               <div class="topDiv">
                 <div style="width: 4px; height: 52px; background: #3A79FF; border-radius: 2px;"></div>
                 <div class="centerDiv">
-                  <span style="font-size: 30px; line-height: 30px; color: rgba(0,0,0,0.85);">{{ factoryNum[index] }}</span>
+                  <span style="font-size: 30px; line-height: 30px; color: rgba(0,0,0,0.85);">{{ factoryNum[index]
+                    }}</span>
                   <span style="font-size: 14px; color: rgba(0,0,0,0.85);">{{item}}</span>
                 </div>
                 <svg-icon icon-class="factoryWorkOrder" style="width: 26px; height: 26px" />
@@ -49,27 +50,28 @@
     <div class="app-container" style="margin-top: 8px;flex-grow: 1;">
       <!-- <search-bar :formConfigs="formConfig2" ref="searchBarForm" style="margin-bottom: 0" /> -->
       <search-bar :formConfigs="formConfig" ref="searchBarForm" @headBtnClick="buttonClick" />
-      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize"
+      <base-table :table-props="tableProps" :page="listQuery.pageNo" :limit="listQuery.pageSize" :table-data="tableData"
-        :table-data="tableData" :max-height="tableH">
+        :max-height="tableH">
         <method-btn v-if="tableBtn.length" slot="handleBtn" label="操作" :width="120" fixed="right"
           :method-list="tableBtn" @clickBtn="handleClick" />
       </base-table>
-      <pagination
+      <pagination :limit.sync="listQuery.pageSize" :page.sync="listQuery.pageNo" :total="listQuery.total"
-        :limit.sync="listQuery.pageSize"
+        @pagination="getDataList" />
-        :page.sync="listQuery.pageNo"
+    </div>
-        :total="listQuery.total"
+    <add-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" :date="listQuery.date"
-        @pagination="getDataList"
+      @refreshDataList="successSubmit" @destroy="detailOrUpdateVisible = false" />
-      />
+    <div id="dayRepDom" style="position: absolute;top:0;display: none;">
+      <ExportDayReport :beProcessObj="beProcessObj" :produceData="produceData" :hisObj="hisObj" :pieList="pieList" />
     </div>
-    <add-or-update v-if="detailOrUpdateVisible" ref="detailOrUpdate" :date="listQuery.date" @refreshDataList="successSubmit" @destroy="detailOrUpdateVisible = false" />
   </div>
 </template>
 
 <script>
 // import { parseTime } from '../../core/mixins/code-filter';
-import { getWorkOrderPage, exportExcel, getOverView } from '@/api/produceData/order';
+import { getWorkOrderPage, exportExcel, getOverView, getWorkOrderDetail } from '@/api/produceData/order';
 // import inputTable from './inputTable.vue';
 import lineChart from './lineChart';
+import ExportDayReport from './dayReportComponents/ExportDayReport'
 import moment from 'moment'
 import tableHeightMixin from "@/mixins/tableHeightMixin";
 // import ButtonNav from '@/components/ButtonNav'
@@ -78,11 +80,12 @@ import AddOrUpdate from './add-or-updata';
 import { factoryList, factoryArray } from "@/utils/constants";
 // import { publicFormatter } from "@/utils/dict";
 import statusChart from "./statusChart.vue";
-
+import html2canvas from 'html2canvas'
+import JsPDF from 'jspdf'
 // import FileSaver from 'file-saver'
 // import * as XLSX from 'xlsx'
 export default {
-  components: { lineChart, AddOrUpdate },
+  components: { lineChart, AddOrUpdate, ExportDayReport },
   mixins: [basicPage, tableHeightMixin],
 	data() {
     return {
@@ -91,6 +94,16 @@ export default {
       inputNum: 0,
       heightNum: 180,
       factoryList,
+      produceData: [],
+      pieList:[],
+      hisObj: {
+        seriesList: [],
+        dateList:[],
+      },
+      beProcessObj: {
+        xAxisList: [],
+        yAxisList:[]
+      },
       factoryArray,
       listQuery: {
         pageSize: 20,
@@ -106,6 +119,10 @@ export default {
             type: 'detail',
             btnName: '详情',
         },
+        {
+          type: 'export',
+          btnName: '导出',
+        },
         // {
         //     type: 'delete',
         //     btnName: '删除',
@@ -142,15 +159,15 @@ export default {
           selectOptions: [
             {
               label: '未开始',
-              value: 1
+              value: 0
             },
             {
               label: '生产中',
-              value: 2
+              value: 1
             },
             {
               label: '已完成',
-              value: 3
+              value: 2
             }
           ],
           labelField: "label",
@@ -281,6 +298,29 @@ export default {
     this.getOverView()
   },
   methods: {
+    exportPDF() {
+      setTimeout(() => {
+        this.$message.success('正在导出，请稍等！')
+        const element = document.getElementById('dayRepDom')
+        element.style.display = 'block'
+        const fileName = '工单数据' + moment().format('yyMMDD') + '.pdf'
+        html2canvas(element, {
+          dpi: 300, // Set to 300 DPI
+          scale: 3 // Adjusts your resolution
+        }).then(function (canvas) {
+          const imgWidth = 595.28
+          const imgHeight = 841.89
+          const pageData = canvas.toDataURL('image/jpeg', 1.0)
+          const PDF = new JsPDF('', 'pt', [imgWidth, imgHeight])
+          PDF.addImage(pageData, 'JPEG', 0, 0, imgWidth, imgHeight)
+          setTimeout(() => {
+            PDF.save(fileName) // 导出文件名
+          }, 1000)
+        })
+        element.style.display = 'none'
+      }, 3000)
+
+    },
     getOverView() {
       getOverView().then(res => {
         // this.data = res.data
@@ -299,11 +339,46 @@ export default {
       })
     },
     otherMethods(val) {
+      console.log(val)
+      if (val.type === 'detail') {
         this.detailOrUpdateVisible = true;
         // this.addOrEditTitle = "详情";
         this.$nextTick(() => {
           this.$refs.detailOrUpdate.init(val.data.id);
         });
+      } else {
+        getWorkOrderDetail(val.data.id).then((res) => {
+          if (res.code === 0) {
+            // this.loading = false
+
+            const xAxisList = Object.keys(res.data.inProcessDis)
+            const yAxisList = Object.values(res.data.inProcessDis)
+            this.beProcessObj.xAxisList = xAxisList
+            this.beProcessObj.yAxisList = yAxisList
+            // console.log(this.beProcessObj)
+              ; const data = res.data.prodWorkOrderDO
+            const barList = [data.targetProduction, data.plannedInvestment, data.actualInvestment, data.actualProduction, data.wasteNum, data.reworkNum]
+            const seriesList = []
+            const dateList = []
+            res.data.his.forEach(element => {
+              seriesList.push(element.actualProduction)
+              dateList.push(element.recordTime[0] + '-' + element.recordTime[1] + '-' + element.recordTime[2])
+            })
+            this.hisObj.seriesList = seriesList
+            this.hisObj.dateList = dateList
+            this.produceData = barList
+            this.pieList = [
+              { value: data.actualProduction ? data.actualProduction : 0, name: '实际产出' },
+              { value: data.wasteNum ? data.wasteNum : 0, name: '废品数量' },
+              { value: data.reworkNum ? data.reworkNum : 0, name: '待再加工数量' }
+            ]
+          }
+          this.$nextTick(() => {
+            this.exportPDF()
+          })
+        })
+
+      }
     },
     async getDataList() {
       const res = await getWorkOrderPage(this.listQuery)

src/views/produce/workOrder/statusChart.vue

@@ -1,8 +1,8 @@
 <!--
  * @Author: Do not edit
  * @Date: 2024-06-24 15:03:19
- * @LastEditTime: 2024-06-24 15:07:42
+ * @LastEditTime: 2024-07-08 08:48:58
- * @LastEditors: DY
+ * @LastEditors: zhp
  * @Description:
 -->
 <template>
@@ -22,10 +22,10 @@ export default {
   },
   computed: {
     state() {
-      return ['', '未开始', '生产中', '已完成'][this.injectData.orderStatus]
+      return ['未开始', '生产中', '已完成'][this.injectData.orderStatus]
     },
     myClass() {
-      return ['', 'yellow', 'blue', 'green'][this.injectData.orderStatus]
+      return ['yellow', 'blue', 'green'][this.injectData.orderStatus]
     }
   },
 };

src/views/report/chipOEEBM/index.vue

@@ -96,7 +96,7 @@ export default {
             name: "",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -110,7 +110,7 @@ export default {
             name: "",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -187,19 +187,19 @@ export default {
             {
               prop: "yoy",
               label: msg.yoyColumn,
-              filter: (val) => (val || val === 0 ? val : "-"),
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
               minWidth: 150,
             },
             {
               prop: "queryValue",
               label: msg.queryColumn,
-              filter: (val) => (val || val === 0 ? val : "-"),
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
-              filter: (val) => (val || val === 0 ? val : "-"),
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
               minWidth: 150,
             },
           ];
@@ -273,7 +273,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -287,7 +287,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [0, -16],

src/views/report/chipOutputBM/index.vue

@@ -93,7 +93,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
@@ -107,7 +107,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -285,7 +285,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
@@ -299,7 +299,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [0, -16],

src/views/report/chipPerCapitaBM/index.vue

@@ -93,7 +93,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
@@ -107,7 +107,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -272,7 +272,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
@@ -286,7 +286,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+             barWidth: 16,
             label: {
               show: true,
               position: [0, -16],

src/views/report/chipYieldBM/index.vue

@@ -96,7 +96,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -110,7 +110,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -273,7 +273,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -287,7 +287,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],

src/views/report/completionStatusIntrBM/index.vue

@@ -73,13 +73,13 @@ export default {
             name: "1",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
           },
           {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             barGap: "-100%",
             label: {
               show: true,
@@ -98,13 +98,13 @@ export default {
             name: "1",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
           },
           {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             barGap: "-100%",
             label: {
               show: true,
@@ -176,13 +176,13 @@ export default {
             {
               prop: "queryValue",
               label: msg.queryColumn,
-              filter: (val) => (val || val === 0 ? val : "-"),
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
-              filter: (val) => (val || val === 0 ? val : "-"),
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
               minWidth: 150,
             },
           ];
@@ -222,6 +222,7 @@ export default {
       });
     },
     setChartMsg(val) {
+      console.log(val);
       let xData1 = [];
       let xData2 = [];
       let barData1 = [];
@@ -231,12 +232,12 @@ export default {
       for (let i = 0; i < val.length; i++) {
         if (val[i].unit !== "㎡") {
           xData1.push(val[i].item);
-          barData1.push(val[i].target || 0);
+          barData1.push(val[i].target ? parseFloat(val[i].target.toFixed(2)) : 0);
-          barData2.push(val[i].queryValue || 0);
+          barData2.push(val[i].queryValue ?  parseFloat(val[i].queryValue.toFixed(2)) : 0);
         } else {
           xData2.push(val[i].item);
-          barData3.push(val[i].target || 0);
+          barData3.push(val[i].target ? parseFloat(val[i].target.toFixed(2)) : 0);
-          barData4.push(val[i].queryValue || 0);
+          barData4.push(val[i].queryValue ? parseFloat(val[i].queryValue.toFixed(2)) : 0);
         }
       }
       this.chartMsg1.xData = xData1;
@@ -258,13 +259,13 @@ export default {
             name: "1",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
           },
           {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             barGap: "-100%",
             label: {
               show: true,
@@ -283,13 +284,13 @@ export default {
             name: "1",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
           },
           {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             barGap: "-100%",
             label: {
               show: true,

src/views/report/components/produceLineBar.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-19 15:28:34
- * @LastEditTime: 2024-07-02 08:41:11
+ * @LastEditTime: 2024-07-12 09:12:10
  * @LastEditors: zhp
  * @Description:
 -->
@@ -51,20 +51,24 @@ export default {
             },
           },
           formatter: function (params) {
-            // console.log('params', params);
+            console.log('params', params)
             var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
             for (var i = 0, l = params.length; i < l; i++) {
               res +=
                 "<br/>" +
-                `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
+              `${params[i].seriesType === "line"
+                ? '<img width="11" height="11" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
+                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
+              }` +
                 `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
               `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
                   ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                 : params[i].seriesName === "转化效率"
                     ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                   : params[i].seriesName.search('总功率') != -1
-                      ? (params[i].value ? params[i].value : 0) + "MW"
+                    ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "MW"
-                    : (params[i].value ? params[i].value : 0) + "片"
+                    : params[i].seriesName.search('BIPV') != -1
+                      ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "㎡" : (params[i].value ? params[i].value : 0) + "片"
                 }</span>`;
             }
             return res;
@@ -234,7 +238,7 @@ export default {
   text-align: right;
   position: relative;
   // right: 30;
-  top: -10px;
+  top: 0px;
   .itemData {
     display: inline-block;
     margin-right: 10px;

src/views/report/components/produceLineBarTarget.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:36
- * @LastEditTime: 2024-07-02 08:40:56
+ * @LastEditTime: 2024-07-09 16:15:10
  * @LastEditors: zhp
  * @Description:
 -->
@@ -59,12 +59,13 @@ export default {
                 `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[i].color}'></span>` +
                 `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
               `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
-                ? (params[i].data.titleValue ? params[i].data.titleValue.toFixed(2) : 0.0) + "%"
+                ? (params[i].data.titleValue ? parseFloat(params[i].data.titleValue.toFixed(2)) : 0.0) + "%"
                 : params[i].seriesName === "转化效率"
-                  ? (params[i].data.titleValue ? params[i].data.titleValue.toFixed(2) : 0.0) + "%"
+                  ? (params[i].data.titleValue ? parseFloat(params[i].data.titleValue.toFixed(2)) : 0.0) + "%"
                   : params[i].seriesName.search('总功率') != -1
-                    ? (params[i].data.titleValue ? params[i].data.titleValue : 0) + "MW"
+                    ? (params[i].data.titleValue ? parseFloat(params[i].data.titleValue.toFixed(2)) : 0) + "MW"
-                    : (params[i].data.titleValue ? params[i].data.titleValue : 0) + "片"
+                    : params[i].seriesName.search('BIPV') != -1
+                      ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "㎡" : (params[i].data.titleValue ? params[i].data.titleValue : 0) + "片"
                 }</span>`;
             }
             return res;
@@ -236,7 +237,7 @@ export default {
   position: relative;
   // right: 30;
   // top: 10px;
-  top: -10px;
+  top: 0px;
   .itemData {
     display: inline-block;
     margin-right: 10px;

src/views/report/components/produceLineBarYearTarget.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-20 16:13:52
- * @LastEditTime: 2024-07-02 08:41:23
+ * @LastEditTime: 2024-07-11 16:45:08
  * @LastEditors: zhp
  * @Description:
 -->
@@ -38,7 +38,7 @@ export default {
         grid: {
           left: 60,
           right: 0,
-          bottom: 30,
+          bottom: 31,
           top: 30,
           containLabel:true,
         },
@@ -51,7 +51,6 @@ export default {
             },
           },
           formatter: function (params) {
-            // console.log('params', params);
             var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
             for (var i = 0, l = params.length; i < l; i++) {
               res +=
@@ -61,10 +60,11 @@ export default {
               `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
                   ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
                 : params[i].seriesName === "转化效率"
-                    ? params[i].value+ "%"
+                  ? parseFloat(params[i].value.toFixed(2)) + "%"
                   : params[i].seriesName.search('总功率') != -1
-                    ? (params[i].value ? params[i] : 0) + "MW"
+                    ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "MW"
-                    : (params[i].value ? params[i].value : 0) + "片"
+                    : params[i].seriesName.search('BIPV') != -1
+                      ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "㎡":(params[i].value ? params[i].value : 0) + "片"
                 }</span>`;
             }
             return res;
@@ -214,7 +214,7 @@ export default {
   text-align: right;
   position: relative;
   // right: 30;
-  top: -10px;
+  top: 0px;
   // top: -10px;
   .itemData {
     display: inline-block;

src/views/report/components/produceLineYieldBar.vue

@@ -0,0 +1,277 @@
+<!--
+ * @Author: zhp
+ * @Date: 2024-07-09 16:06:13
+ * @LastEditTime: 2024-07-09 16:14:54
+ * @LastEditors: zhp
+ * @Description:
+-->
+<!--
+ * @Author: zhp
+ * @Date: 2024-06-19 15:28:34
+ * @LastEditTime: 2024-07-08 14:19:57
+ * @LastEditors: zhp
+ * @Description:
+-->
+<template>
+  <div>
+    <!-- 暂无数据 -->
+    <div class="no-data-bg" style="position: relative; left: 50%; transform: translateX(-50%)"
+      v-show="this.chartMsg.series[0].data.length === 0"></div>
+    <!-- 图例 -->
+    <div v-show="this.chartMsg.series[0].data.length > 0 ">
+      <div class="legendData" v-if="show">
+        <span class="itemData" v-for="item in legendList" :key="item.id">
+          <span v-if="item.type === 1" class="block" :style="{ backgroundColor: item.color }"></span>
+          <span v-if="item.type === 2" class="line" :style="{ backgroundColor: item.color }">
+            <span class="line-block" :style="{ backgroundColor: item.color }"></span>
+          </span>
+          {{ item.name }}</span>
+      </div>
+      <div :id="chartId" :style="{ width: '100%', height: chartHeight + 'px' }"></div>
+    </div>
+  </div>
+</template>
+<script>
+import * as echarts from "echarts";
+import { debounce } from "@/utils/debounce";
+export default {
+  name: "bmLineBar",
+  data() {
+    return {
+      myChart: "",
+      option: {
+        color: [],
+        // color: ["#8EF0AB", "#63BDFF", "#288AFF"],
+        grid: {
+          left: 30,
+          right: 50,
+          bottom: 30,
+          top: 30,
+          containLabel:true,
+        },
+        tooltip: {
+          trigger: "axis",
+          axisPointer: {
+            // type: "cross",
+            crossStyle: {
+              color: "rgba(237,237,237,0.5)",
+            },
+          },
+          formatter: function (params) {
+            console.log('params', params)
+            var res = `<span style='color:rgba(0,0,0,0.8)'>${params[0].axisValueLabel}</span>`;
+            for (var i = 0, l = params.length; i < l; i++) {
+              res +=
+                "<br/>" +
+              `${params[i].seriesType === "line"
+                ? '<img width="11" height="11" style="margin-right:4px;" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0iVVRGLTgiPz4KPHN2ZyB3aWR0aD0iMTIuNzIxNjM5NXB4IiBoZWlnaHQ9IjhweCIgdmlld0JveD0iMCAwIDEyLjcyMTYzOTUgOCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIj4KICAgIDx0aXRsZT7nvJbnu4QgNjwvdGl0bGU+CiAgICA8ZyBpZD0iMDTmiqXooajnrqHnkIYiIHN0cm9rZT0ibm9uZSIgc3Ryb2tlLXdpZHRoPSIxIiBmaWxsPSJub25lIiBmaWxsLXJ1bGU9ImV2ZW5vZGQiPgogICAgICAgIDxnIGlkPSLmjIfmoIflrozmiJDmg4XlhrUiIHRyYW5zZm9ybT0idHJhbnNsYXRlKC0xMDUxLjYzOTE4MCwgLTQyNS4wMDAwMDApIj4KICAgICAgICAgICAgPGcgaWQ9Iue8lue7hC025aSH5Lu9LTQiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDEwMjEuNTAwMDAwLCAzNDQuMDAwMDAwKSI+CiAgICAgICAgICAgICAgICA8ZyBpZD0i57yW57uELTYiIHRyYW5zZm9ybT0idHJhbnNsYXRlKDI5LjUwMDAwMCwgNzguMDAwMDAwKSI+CiAgICAgICAgICAgICAgICAgICAgPHJlY3QgaWQ9IuefqeW9oiIgeD0iMCIgeT0iMCIgd2lkdGg9IjE0IiBoZWlnaHQ9IjE0Ij48L3JlY3Q+CiAgICAgICAgICAgICAgICAgICAgPHBhdGggZD0iTTcuMTM5MTgwMjYsMyBDOS4wMDMxMDczNywzIDEwLjU2OTI2NzMsNC4yNzQ4OTI3MiAxMS4wMTMyMjU0LDYuMDAwMjQzNDcgTDEyLjM2MDgxOTcsNiBDMTIuOTEzMTA0NSw2IDEzLjM2MDgxOTcsNi40NDc3MTUyNSAxMy4zNjA4MTk3LDcgQzEzLjM2MDgxOTcsNy41NTIyODQ3NSAxMi45MTMxMDQ1LDggMTIuMzYwODE5Nyw4IEwxMS4wMTI5NjY3LDguMDAwNzYxMzQgQzEwLjU2ODY1OTIsOS43MjU2MDIyNCA5LjAwMjc0NTUxLDExIDcuMTM5MTgwMjYsMTEgQzUuMjc1NjE1MDEsMTEgMy43MDk3MDEzMSw5LjcyNTYwMjI0IDMuMjY1MzkzNzgsOC4wMDA3NjEzNCBMMS42MzkxODAyNiw4IEMxLjA4Njg5NTUxLDggMC42MzkxODAyNTgsNy41NTIyODQ3NSAwLjYzOTE4MDI1OCw3IEMwLjYzOTE4MDI1OCw2LjQ0NzcxNTI1IDEuMDg2ODk1NTEsNiAxLjYzOTE4MDI2LDYgTDMuMjY1MTM1MDksNi4wMDAyNDM0NyBDMy43MDkwOTMyLDQuMjc0ODkyNzIgNS4yNzUyNTMxNSwzIDcuMTM5MTgwMjYsMyBaIiBpZD0i5b2i54q257uT5ZCIIiBmaWxsPSIjRkZDRTZBIiBmaWxsLXJ1bGU9Im5vbnplcm8iPjwvcGF0aD4KICAgICAgICAgICAgICAgIDwvZz4KICAgICAgICAgICAgPC9nPgogICAgICAgIDwvZz4KICAgIDwvZz4KPC9zdmc+" />'
+                : `<span style="display:inline-block;margin-right:4px;border-radius:2px;width:10px;height:10px;background-color:${params[i].color}"></span>`
+              }` +
+                `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[i].seriesName}</span>` +
+              `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[i].seriesName === "综合良率"
+                  ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
+                : params[i].seriesName === "转化效率"
+                    ? (params[i].value ? params[i].value.toFixed(2) : 0.0) + "%"
+                  : params[i].seriesName.search('总功率') != -1
+                    ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "MW"
+                    : params[i].seriesName.search('BIPV') != -1
+                      ? (params[i].value ? parseFloat(params[i].value.toFixed(2)) : 0) + "㎡" : (params[i].value ? params[i].value : 0) + "片"
+                }</span>`;
+            }
+            return res;
+          },
+        },
+        xAxis: {
+          type: "category",
+          data: [],
+          axisTick: {
+            show: false,
+          },
+          axisPointer: {
+            type: "shadow",
+          },
+        },
+        dataZoom: [//滚动条
+          {
+            // 设置滚动条的隐藏与显示
+            show: true,
+            // 设置滚动条类型
+            type: "slider",
+            // 设置背景颜色
+            backgroundColor: "#F7F7F7",
+            // handleStyle: {
+            //   color: '#D6D6D6'
+            // },
+            handleStyle: {
+              borderColor: '#EBEBEB',
+              color: '#EBEBEB'
+            },
+            moveHandleStyle: {
+              borderColor: '#EBEBEB',
+              color: '#EBEBEB'
+            },
+            emphasis: {
+              handleStyle: {
+                borderColor: '#D6D6D6',
+                color: '#D6D6D6'
+              },
+              moveHandleStyle: {
+                borderColor: '#D6D6D6',
+                color: '#D6D6D6'
+              }
+            },
+            // 设置选中范围的填充颜色
+            fillerColor: "#F7F7F7",
+            // 设置边框颜色
+            borderColor: "#F7F7F7",
+            // 是否显示detail，即拖拽时候显示详细数值信息
+            showDetail: false,
+            // 数据窗口范围的起始数值
+            startValue: 0,
+            // 数据窗口范围的结束数值（一页显示多少条数据）
+            endValue: 5,
+            // empty：当前数据窗口外的数据，被设置为空。
+            // 即不会影响其他轴的数据范围
+            filterMode: "empty",
+            // 设置滚动条宽度，相对于盒子宽度
+            width: "100%",
+            // 设置滚动条高度
+            height: 3,
+            // 设置滚动条显示位置
+            left: "center",
+            // 是否锁定选择区域（或叫做数据窗口）的大小
+            zoomLoxk: true,
+            // 控制手柄的尺寸
+            handleSize: 0,
+            // dataZoom-slider组件离容器下侧的距离
+            bottom: 14,
+          },
+          {
+            // 没有下面这块的话，只能拖动滚动条，
+            // 鼠标滚轮在区域内不能控制外部滚动条
+            type: "inside",
+            // 滚轮是否触发缩放
+            zoomOnMouseWheel: false,
+            // 鼠标滚轮触发滚动
+            moveOnMouseMove: true,
+            moveOnMouseWheel: true,
+          },
+        ],
+        yAxis:undefined,
+        series: [],
+      },
+    };
+  },
+  props: {
+    chartHeight: {
+      type: Number,
+      default: 300,
+    },
+    type: {
+      type: Number,
+      default: 2,
+    },
+    show: {
+      type: Boolean,
+      default: true,
+    },
+    legendList: {
+      type: Array,
+      default: () => [],
+    },
+    chartMsg: {
+      type: Object,
+      default: () => {},
+    },
+    chartId: {
+      type: String,
+      default: "bmChart",
+    },
+    chartNum: {
+      type: Number,
+      default: 1,
+    },
+  },
+  watch: {
+    chartHeight: {
+      handler(newVal) {
+        this.chartHeight = newVal;
+      },
+    },
+    type() {
+      this.canvasReset();
+    },
+    chartNum(val) {
+      this.canvasReset();
+    },
+    chartMsg: {
+      handler(newVal) {
+        this.canvasReset();
+      },
+      deep: true,
+    },
+  },
+  mounted() {
+    this.canvasReset();
+  },
+  methods: {
+    canvasReset() {
+      debounce(() => {
+        this.getMes();
+      }, 500)();
+    },
+    getMes() {
+      console.log('222222', this.chartMsg.series);
+      if (this.myChart) {
+        this.myChart.dispose();
+      }
+      var chartDom = document.getElementById(this.chartId);
+      this.myChart = echarts.init(chartDom);
+      this.option.color = this.chartMsg.color;
+      this.option.xAxis.data = this.chartMsg.xData;
+      // this.option.yAxis.name = this.chartMsg.yName;
+
+      // this.option.yAxis.axisLabel = this.chartMsg.yAxisLabel;
+      this.option.series = this.chartMsg.series;
+      this.option.yAxis = this.chartMsg.yAxis;
+
+      this.myChart.setOption(this.option);
+    },
+  },
+};
+</script>
+<style lang="scss" scoped>
+.legendData {
+  text-align: right;
+  position: relative;
+  // right: 30;
+  top: 0px;
+  .itemData {
+    display: inline-block;
+    margin-right: 10px;
+    font-size: 14px;
+    color: #8c8c8c;
+    .block {
+      width: 10px;
+      height: 10px;
+      display: inline-block;
+      margin-right: 4px;
+    }
+    .line {
+      width: 10px;
+      height: 10px;
+      border-radius: 5px;
+      display: inline-block;
+      margin-right: 4px;
+      position: relative;
+      .line-block {
+        position: absolute;
+        width: 20px;
+        height: 2px;
+        left: -5px;
+        top: 4px;
+      }
+    }
+  }
+}
+</style>

src/views/report/components/produceLineYieldBarTarget.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-06-21 09:05:14
- * @LastEditTime: 2024-07-02 08:33:22
+ * @LastEditTime: 2024-07-09 16:15:04
  * @LastEditors: zhp
  * @Description:
 -->
@@ -51,7 +51,7 @@ export default {
             },
           },
           formatter: function (params) {
-            // console.log('params', params)
+            console.log('params', params)
             let arr = []
             var res = ``;
             // for (var i = 0, l = params.length; i < l; i++) {
@@ -61,11 +61,11 @@ export default {
                 `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[0].color}'></span>` +
               `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[0].axisValueLabel}</span>` +
               `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[0].name === "综合良率"
-                  ? (params[0].value ? params[0].value.toFixed(2) : 0.0) + "%"
+                ? (params[0].value ? parseFloat(params[0].value.toFixed(2)) : 0.0) + "%"
                 : params[0].name === "转化效率"
-                    ? (params[0].value ? params[0].value.toFixed(2) : 0.0) + "%"
+                  ? (params[0].value ? parseFloat(params[0].value.toFixed(2)) : 0.0) + "%"
-                  : params[0].seriesName.search('总功率') != -1
+                  : params[0].axisValueLabel.search('总功率') != -1
-                    ? (params[0].value ? params[0].value : 0) + "MW"
+                    ? (params[0].value ? parseFloat(params[0].value.toFixed(2)) : 0) + "MW"
                     : (params[0].value ? params[0].value : 0) + "片"
                 }</span>`;
               // }
@@ -75,11 +75,11 @@ export default {
                 `<span style='display:inline-block;margin-right:4px;width:10px;height:10px;background-color:${params[1].color}'></span>` +
               `<span style='display:inline-block;width:150px;color:rgba(0,0,0,0.8);font-size:14px;'>${params[1].axisValueLabel}</span>` +
               `<span style='color:rgba(0,0,0,0.48);font-size:14px;'>${params[1].name === "综合良率"
-                ? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
+                ? (params[1].value ? parseFloat(params[1].value.toFixed(2)) : 0.0) + "%"
                 : params[1].name === "转化效率"
-                  ? (params[1].value ? params[1].value.toFixed(2) : 0.0) + "%"
+                  ? (params[1].value ? parseFloat(params[1].value.toFixed(2)) : 0.0) + "%"
-                  : params[1].seriesName.search('总功率') != -1
+                  : params[1].axisValueLabel.search('总功率') != -1
-                    ? (params[1].value ? params[1].value : 0) + "MW"
+                    ? (params[1].value ? parseFloat(params[1].value.toFixed(2)) : 0) + "MW"
                     : (params[1].value ? params[1].value : 0) + "片"
                 }</span>`;
             }
@@ -227,7 +227,7 @@ export default {
 .legendData {
   text-align: right;
   position: relative;
-  top: -10px;
+  top: 0px;
   // right: 30;
   // top: 10px;
   .itemData {

src/views/report/comprehensiveData.vue

@@ -1,7 +1,7 @@
 <!--
  * @Author: zhp
  * @Date: 2024-04-15 10:49:13
- * @LastEditTime: 2024-07-01 14:43:42
+ * @LastEditTime: 2024-07-10 15:45:28
  * @LastEditors: zhp
  * @Description:
 -->
@@ -20,9 +20,9 @@
           </el-select>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+          <el-date-picker prefix-icon="el-icon-date" size="small" clearable v-model="listQuery.reportTime"
-            start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
+            type="daterange" range-separator="至" start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
-            end-placeholder="结束日期">
+            @change="changeDayTime" end-placeholder="结束日期">
           </el-date-picker>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 1" label="时间范围" prop="reportTime">
@@ -201,12 +201,29 @@ export default {
     // this.getOverView()
     const today = new Date()
     const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
-    this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD')
+    this.listQuery.startDate = this.getFirstDay()
-    this.listQuery.endDate = moment(today).format('yyyy-MM-DD')
+    this.listQuery.endDate = this.getLastDay()
     this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate]
     this.getDataList()
   },
   methods: {
+    getFirstDay() {
+      //当前月第一天
+      var y = new Date().getFullYear(); //获取年份
+      var m = new Date().getMonth() + 1; //获取月份
+      var d = "01";
+      m = m < 10 ? "0" + m : m; //月份补 0
+      return [y, m, d].join("-");
+    },
+    getLastDay() {
+      //当前月最后一天
+      var y = new Date().getFullYear(); //获取年份
+      var m = new Date().getMonth() + 1; //获取月份
+      var d = new Date(y, m, 0).getDate(); //获取当月最后一日
+      m = m < 10 ? "0" + m : m; //月份补 0
+      d = d < 10 ? "0" + d : d; //日数补 0
+      return [y, m, d].join("-");
+    },
     handleChange() {
       this.listQuery.reportTime = []
       this.listQuery.end = null
@@ -327,11 +344,13 @@ export default {
     },
     async getDataList() {
       console.log(this.listQuery.type);
-      if (this.listQuery.type == null) {
+      if (this.listQuery.type === '') {
-        return this.$message('请选择时间维度')
+        this.$message.warning('请选择时间维度！')
+        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        return this.$message('请选择起止时间')
+        this.$message.warning('请选择起止时间')
+        return
       }
       this.otherProps = []
       let arr  = []
@@ -357,10 +376,6 @@ export default {
           type: '芯片',
           item: '芯片良率',
           unit: '%'
-        }, {
-          type: '芯片',
-          item: '芯片产量',
-          unit: '片'
         }, {
           type: '芯片',
           item: '芯片总功率',
@@ -429,7 +444,7 @@ export default {
         {
           type: 'BIPV',
           item: 'BIPV产量',
-          unit: 'm2'
+          unit: '㎡'
         },
         {
           type: 'BIPV',
@@ -439,7 +454,7 @@ export default {
           {
           type: 'BIPV',
           item: '人均产量',
-          unit: 'm2/人'
+          unit: '㎡/人'
         },
         {
           type: 'BIPV',
@@ -462,6 +477,7 @@ export default {
         // this.chartMsg.xData.push(ele.titleValue)
         this.otherProps.push({
           label: ele.titleValue,
+          filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
           prop: 'value' + i
         })
       })
@@ -471,35 +487,31 @@ export default {
         let m = 'value' + i
         // ele.productYieldDataVOList.forEach((item) => {
           dataArr[0]['' + m + ''] = item.ftoInput
-          // dataArr[0].factory = item.factory === 1 ? '邯郸' : '瑞昌'
+        dataArr[1]['' + m + ''] = item.chipYield
-          // dataArr[1].factory = item.factory === 1 ? '邯郸' : '瑞昌'
+        dataArr[2]['' + m + ''] = item.chipAveragePower
-          // dataArr[2].factory = item.factory === 1 ? '邯郸' : '瑞昌'
-        // dataArr[3].factory = item.factory === 1 ? '邯郸' : '瑞昌'
-          dataArr[1]['' + m + ''] = item.chipInput
-          dataArr[2]['' + m + ''] = item.chipYield
         dataArr[3]['' + m + ''] = item.chipYieldRate
-          dataArr[4]['' + m + ''] = item.chipAveragePower
+        dataArr[4]['' + m + ''] = item.chipTotalPower
-          dataArr[5]['' + m + ''] = item.chipTotalPower
+        dataArr[5]['' + m + ''] = item.chipCssMarriageRate
-          dataArr[6]['' + m + ''] = item.chipCssMarriageRate
+        dataArr[6]['' + m + ''] = item.chipOee
-          dataArr[7]['' + m + ''] = item.chipOee
+        dataArr[7]['' + m + ''] = item.chipCapacityUtilizationRate
-          dataArr[8]['' + m + ''] = item.chipCapacityUtilizationRate
+        dataArr[8]['' + m + ''] = item.chipAnnualAverageProduction
-          dataArr[9]['' + m + ''] = item.chipAnnualAverageProduction
+        dataArr[9]['' + m + ''] = item.chipBom
-          dataArr[10]['' + m + ''] = item.chipBom
+        dataArr[10]['' + m + ''] = item.componentYield
-          dataArr[11]['' + m + ''] = item.componentYield
+        dataArr[11]['' + m + ''] = item.componentAveragePower
-          dataArr[12]['' + m + ''] = item.componentAveragePower
+        dataArr[12]['' + m + ''] = item.componentYieldRate
-          dataArr[13]['' + m + ''] = item.componentYieldRate
+        dataArr[13]['' + m + ''] = item.componentTotalPower
-          dataArr[14]['' + m + ''] = item.componentTotalPower
+        dataArr[14]['' + m + ''] = item.componentOee
-          dataArr[15]['' + m + ''] = item.componentOee
+        dataArr[15]['' + m + ''] = item.componentCapacityUtilizationRate
-          dataArr[16]['' + m + ''] = item.componentCapacityUtilizationRate
+        dataArr[16]['' + m + ''] = item.componentAnnualAverageProduction
-          dataArr[17]['' + m + ''] = item.componentAnnualAverageProduction
+        dataArr[17]['' + m + ''] = item.componentBom
-          dataArr[18]['' + m + ''] = item.componentBom
+        dataArr[18]['' + m + ''] = item.bipvChipUsage
-          dataArr[19]['' + m + ''] = item.bipvChipUsage
+        dataArr[19]['' + m + ''] = item.bipvProductOutput
-          dataArr[20]['' + m + ''] = item.bipvProductOutput
+        dataArr[20]['' + m + ''] = item.bipvChipUtilizationRate
-          dataArr[21]['' + m + ''] = item.bipvChipUtilizationRate
+        dataArr[21]['' + m + ''] = item.bipvAnnualAverageProduction
-          dataArr[22]['' + m + ''] = item.bipvAnnualAverageProduction
+        dataArr[22]['' + m + ''] = item.bipvOeeMaterialCost
-          dataArr[23]['' + m + ''] = item.bipvOeeMaterialCost
+        dataArr[23]['' + m + ''] = item.bipvInsideMaterialCost
-          dataArr[24]['' + m + ''] = item.bipvInsideMaterialCost
+        dataArr[24]['' + m + ''] = item.bipvComprehensiveMaterialCost
-          dataArr[25]['' + m + ''] = item.bipvComprehensiveMaterialCost
+          // dataArr[25]['' + m + ''] = item.bipvComprehensiveMaterialCost
 
         // })
         // ele.titleValue

src/views/report/conversionEfficiencyBM/index.vue

@@ -96,7 +96,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -110,7 +110,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -273,7 +273,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -287,7 +287,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],

src/views/report/ftoOutputBM/index.vue

@@ -93,7 +93,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
@@ -107,7 +107,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -285,7 +285,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
@@ -299,7 +299,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],

src/views/report/packageOEEBM/index.vue

@@ -96,7 +96,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -110,7 +110,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -187,19 +187,19 @@ export default {
             {
               prop: "yoy",
               label: msg.yoyColumn,
-              filter: (val) => (val || val === 0 ? val : "-"),
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
               minWidth: 150,
             },
             {
               prop: "queryValue",
               label: msg.queryColumn,
-              filter: (val) => (val || val === 0 ? val : "-"),
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
               minWidth: 150,
             },
             {
               prop: "target",
               label: msg.targetColumn,
-              filter: (val) => (val || val === 0 ? val : "-"),
+              filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
               minWidth: 150,
             },
           ];
@@ -273,7 +273,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -287,7 +287,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],

src/views/report/produceConversion.vue

@@ -5,7 +5,7 @@
     </ButtonNav>
     <!-- </div> -->
     <div class="search">
-      <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
+      <el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
         <el-form-item label="时间维度" prop="date">
           <el-select size="small" clearable v-model="listQuery.date" placeholder="请选择" @change="handleChange">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
@@ -13,7 +13,7 @@
           </el-select>
         </el-form-item>
         <el-form-item v-show="listQuery.date === 0 || listQuery.date === ''" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
             start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
             end-placeholder="结束日期">
           </el-date-picker>
@@ -84,8 +84,8 @@
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col> -->
       </el-row>
-      <base-table :key="showTable" :table-props="tableProps" :page="listQuery.current"
+      <base-table :key="showTable" :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size"
-        :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
+        :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
 
@@ -96,7 +96,7 @@
 <script>
 import { getProduceTransData, exportProduceTransData } from '@/api/report';
 import bmSearchBar from "./components/bmSearchBar";
-import BmLineBar from "./components/produceLineBar.vue";
+import BmLineBar from "./components/produceLineYieldBar.vue";
 import produceLineBarYearTarget from "./components/produceLineYieldBarTarget.vue";
 
 import ButtonNav from '@/components/ButtonNav'
@@ -201,7 +201,7 @@ export default {
             name: "单位/%",
             nameTextStyle: {
               fontSize: 12,
-              align: "right",
+              align: "left",
             },
             axisLabel: {},
           }
@@ -212,10 +212,10 @@ export default {
             // yAxisIndex: 0,
             data: [],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
-              position: [-18, -16],
+              position: [0, -16],
               color: "#68C483",
               formatter: function (params) {
                 return params.value
@@ -227,10 +227,10 @@ export default {
             type: 'bar',
             data: [],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
-              position: [-18, -16],
+              position: [0, -16],
               color: "#68C483",
               formatter: function (params) {
                 return params.value
@@ -276,7 +276,7 @@ export default {
             // splitNumber: 5,
             nameTextStyle: {
               fontSize: 12,
-              align: "right",
+              align: "left",
             },
             axisLabel: {},
           }
@@ -287,10 +287,10 @@ export default {
             data: [
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
-              position: [-20, -16],
+              position: [-0, -16],
               color: "#68C483",
               formatter: function (params) {
                 return params.value.toFixed(2)
@@ -302,10 +302,10 @@ export default {
             data: [
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
-              position: [10, -16],
+              position: [0, -16],
               color: "#288AFF",
               formatter: function (params) {
                 return params.value.toFixed(2)
@@ -396,12 +396,29 @@ export default {
     // this.getOverView()
     const today = new Date()
     const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
-    this.listQuery.beginTime = moment(sevenDaysAgo).format('yyyy-MM-DD')
+    this.listQuery.beginTime = this.getFirstDay()
-    this.listQuery.endTime = moment(today).format('yyyy-MM-DD')
+    this.listQuery.endTime = this.getLastDay()
     this.listQuery.reportTime = [this.listQuery.beginTime, this.listQuery.endTime]
     this.getDataList()
   },
   methods: {
+    getFirstDay() {
+      //当前月第一天
+      var y = new Date().getFullYear(); //获取年份
+      var m = new Date().getMonth() + 1; //获取月份
+      var d = "01";
+      m = m < 10 ? "0" + m : m; //月份补 0
+      return [y, m, d].join("-");
+    },
+    getLastDay() {
+      //当前月最后一天
+      var y = new Date().getFullYear(); //获取年份
+      var m = new Date().getMonth() + 1; //获取月份
+      var d = new Date(y, m, 0).getDate(); //获取当月最后一日
+      m = m < 10 ? "0" + m : m; //月份补 0
+      d = d < 10 ? "0" + d : d; //日数补 0
+      return [y, m, d].join("-");
+    },
     handleChange(val) {
       this.listQuery.reportTime = []
       this.listQuery.end = null
@@ -529,11 +546,13 @@ export default {
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
       this.title = ''
-      if (this.listQuery.date == null) {
+      if (this.listQuery.date === '') {
-        return this.$message('请选择时间维度')
+        this.$message.warning('请选择时间维度！')
+        return
       }
       if (!this.listQuery.beginTime && !this.listQuery.endTime) {
-        return this.$message('请选择起止时间')
+        this.$message.warning('请选择起止时间')
+        return
       }
       console.log(this.listQuery);
       if (this.listQuery.type == 3) {
@@ -566,6 +585,7 @@ export default {
           this.chartMsg.xData.push(ele.reportTimep)
           this.otherProps.push({
             label: ele.reportTimep,
+            filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
             prop: 'value' + i
           })
         })
@@ -614,18 +634,27 @@ export default {
         this.chartMsgYearTarget.series[0].data = [
           {
             value: res.data[0].yearTarget.chipTotalPower,
+            label: {
+              color: '#8EF0AB'
+            },
             itemStyle: {
               color: '#8EF0AB'
             }
           },
           {
             value: res.data[0].yearTarget.componentTotalPower,
+            label: {
+              color: '#288AFF'
+            },
             itemStyle: {
               color: '#288AFF'
             }
           },
           {
             value: null,
+            label: {
+              color: '#64BDFF'
+            },
             itemStyle: {
               color: '#64BDFF'
             }
@@ -633,18 +662,27 @@ export default {
         this.chartMsgYearTarget.series[1].data = [
           {
             value: null,
+            label: {
+              color: '#8EF0AB'
+            },
             itemStyle: {
               color: '#8EF0AB'
             }
           },
           {
             value: null,
+            label: {
+              color: '#288AFF'
+            },
             itemStyle: {
               color: '#288AFF'
             }
           },
           {
             value: res.data[0].yearTarget.componentConversionEfficiency,
+            label: {
+              color: '#64BDFF'
+            },
             itemStyle: {
               color: '#64BDFF'
             }
@@ -731,30 +769,45 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
 .search {
   // height: calc((100px));
   background-color: #fff;
   border-radius: 8px;
   padding: 16px 16px 0 16px;
   margin: 8px 0px;
+  .smallTitle {
+      font-size: 16px;
+      color: #000;
+      margin-bottom: 15px;
+    }
+
+    .smallTitle::before {
+      display: inline-block;
+      width: 4px;
+      height: 16px;
+      background: #0b58ff;
+      content: "";
+      margin-right: 8px;
+      vertical-align: -9px;
+    }
 }
 
 .containerTop {
   height: calc((100vh - 170px));
   background-color: #fff;
   border-radius: 8px;
-  padding: 16px;
+  padding: 4px 16px 16px 16px;
 }
 
 .blueTip::before {
   display: inline-block;
-  content: '';
     width: 4px;
-  height: 18px;
+    height: 16px;
-  background: #0B58FF;
+    background: #0b58ff;
-  border-radius: 1px;
+    content: "";
-  margin-right: 8PX;
+    margin-right: 8px;
-  margin-top: 8px;
+    vertical-align: -3px;
 }
 
 .containerTop {

src/views/report/productionSituationMW.vue

@@ -3,7 +3,7 @@
     <ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
     </ButtonNav>
     <div class="search">
-      <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
+      <el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
         <el-form-item label="时间维度" prop="type">
           <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
@@ -11,7 +11,7 @@
           </el-select>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
             start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
             end-placeholder="结束日期">
           </el-date-picker>
@@ -55,34 +55,58 @@
 
       <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
       <el-row v-if="this.listQuery.type === 2">
-        <el-col :span="12">
+        <el-col :span="18">
           <div class="blueTip">
             生产情况对比
           </div>
-          <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
-            :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
-        </el-col>
-        <el-col :span="6" style="margin-top: 30px">
-          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
-            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'" :chartNum="chartNum" />
         </el-col>
         <el-col :span="6">
           <div class="blueTip">
             {{ title }}
           </div>
+        </el-col>
+      </el-row>
+      <el-row v-else-if="this.listQuery.type === 1 || this.listQuery.type === 0">
+        <el-col :span="24">
+          <div class="blueTip">
+            生产情况对比
+          </div>
+        </el-col>
+      </el-row>
+      <el-row v-else>
+        <div class="blueTip">
+          生产情况对比
+        </div>
+      </el-row>
+      <el-row v-if="this.listQuery.type === 2">
+        <el-col :span="12">
+          <!-- <div class="blueTip">
+            生产情况对比
+          </div> -->
+          <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
+            :legendList="legendList" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6">
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartTarget'" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6">
+          <!-- <div class="blueTip">
+            {{ title }}
+          </div> -->
           <bm-line-bar-year-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
             :chartMsg="chartMsgYearTarget" :chartId="'chartYearTarget'" :chartNum="chartNum" />
         </el-col>
       </el-row>
       <el-row v-else-if="this.listQuery.type === 1 || this.listQuery.type === 0">
         <el-col :span="18">
-          <div class="blueTip">
+          <!-- <div class="blueTip">
             生产情况对比
-          </div>
+          </div> -->
           <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
             :legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" />
         </el-col>
-        <el-col :span="6" style="margin-top: 30px">
+        <el-col :span="6">
           <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
             :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'" :chartNum="chartNum" />
         </el-col>
@@ -95,9 +119,9 @@
         </el-col> -->
       </el-row>
       <el-row v-else>
-        <div class="blueTip">
+        <!-- <div class="blueTip">
           生产情况对比
-        </div>
+        </div> -->
         <!-- <el-col :span="12"> -->
         <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
           :chartId="chartId" :chartNum="chartNum" />
@@ -192,13 +216,13 @@ export default {
             data: [
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value
+                return parseFloat(params.value.toFixed(2))
               },
             },
           },
@@ -206,13 +230,13 @@ export default {
             name: "标准组件总功率",
             data: [],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
               color: "#288AFF",
               formatter: function (params) {
-                return params.value
+                return parseFloat(params.value.toFixed(2))
               },
             },
           },
@@ -258,13 +282,13 @@ export default {
             name: "芯片总功率",
             data: [],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
-              position: [-30, -16],
+              position: [-10, -16],
               color: "#68C483",
               formatter: function (params) {
-                return params.value
+                return parseFloat(params.value.toFixed(2))
               },
             },
           },
@@ -273,13 +297,13 @@ export default {
             data: [
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
               color: "#288AFF",
               formatter: function (params) {
-                return params.value
+                return parseFloat(params.value.toFixed(2))
               },
             },
           },
@@ -365,12 +389,29 @@ export default {
     // this.getOverView()
     const today = new Date()
     const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
-    this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD')
+    this.listQuery.startDate = this.getFirstDay()
-    this.listQuery.endDate = moment(today).format('yyyy-MM-DD')
+    this.listQuery.endDate = this.getLastDay()
     this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate]
     this.getDataList()
   },
   methods: {
+    getFirstDay() {
+      //当前月第一天
+      var y = new Date().getFullYear(); //获取年份
+      var m = new Date().getMonth() + 1; //获取月份
+      var d = "01";
+      m = m < 10 ? "0" + m : m; //月份补 0
+      return [y, m, d].join("-");
+    },
+    getLastDay() {
+      //当前月最后一天
+      var y = new Date().getFullYear(); //获取年份
+      var m = new Date().getMonth() + 1; //获取月份
+      var d = new Date(y, m, 0).getDate(); //获取当月最后一日
+      m = m < 10 ? "0" + m : m; //月份补 0
+      d = d < 10 ? "0" + d : d; //日数补 0
+      return [y, m, d].join("-");
+    },
     handleChange() {
       this.listQuery.reportTime = []
       this.listQuery.end = null
@@ -499,12 +540,14 @@ export default {
       this.chartMsgTarget.series = []
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
-      console.log(this.listQuery);
+      console.log(this.listQuery.type);
-      if (this.listQuery.type == null) {
+      if (this.listQuery.type === '') {
-        return this.$message('请选择时间维度')
+        this.$message.warning('请选择时间维度！')
+        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        return this.$message('请选择起止时间')
+        this.$message.warning('请选择起止时间')
+        return
       }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
@@ -516,6 +559,7 @@ export default {
         // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
         this.otherProps.push({
           label: ele.titleValue,
+          filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
           prop: 'value' + i
         })
       })
@@ -630,14 +674,14 @@ export default {
             // { name: "%", value: 18.4 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           // barGap: '-100%',
           label: {
             show: true,
             position: [-18, -16],
             color: "rgba(104,196,131)",
             formatter: function (params) {
-              return params.value
+              return params.value.toFixed(2)
             },
           },
         }, {
@@ -657,7 +701,7 @@ export default {
             position: [-18, -16],
             color: "rgba(104,196,131,.5)",
             formatter: function (params) {
-              return params.value
+              return params.value.toFixed(2)
             },
           },
         })
@@ -666,18 +710,15 @@ export default {
           stack: 'b',
           data: [
             { name: "标准组件总功率完成值", value: obj.componentTotalPower,titleValue:obj.componentTotalPower },
-            // { name: '标准组件总功率完成值', value: 23 },
-            // { name: "%", value: 7.02 },
-            // { name: "%", value: 80.2 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           label: {
             show: true,
             position: [0, -16],
             color: "rgba(40,138,255)",
             formatter: function (params) {
-              return params.value
+              return params.value.toFixed(2)
             },
           },
         }, {
@@ -691,21 +732,18 @@ export default {
             // { name: "%", value: 80.2 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           label: {
             show: true,
             position: [0, -16],
             color: "rgba(40,138,255,.5)",
             formatter: function (params) {
-              return params.value
+              return params.value.toFixed(2)
             },
           },
         })
         console.log('arr', chip,std)
         this.chartMsgTarget.series = [...chip, ...std]
-        // arr.forEach((ele) => {
-
-        // })
         res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele, index) => {
           // let i = index + 1
           this.chartMsgYearTarget.xData.push(ele.titleValue)
@@ -798,7 +836,7 @@ export default {
             // { name: "%", value: 18.4 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           // barGap: '-100%',
           label: {
             show: true,
@@ -839,7 +877,7 @@ export default {
             // { name: "%", value: 80.2 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           label: {
             show: true,
             position: [0, -16],
@@ -859,7 +897,7 @@ export default {
             // { name: "%", value: 80.2 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           label: {
             show: true,
             position: [0, -16],
@@ -953,28 +991,6 @@ export default {
   border-radius: 8px;
   padding: 16px 16px 0 16px;
   margin: 8px 0px;
-}
-
-.containerTop {
-  height: calc((100vh - 170px));
-  background-color: #fff;
-  border-radius: 8px;
-  padding: 16px;
-}
-
-.blueTip::before {
-  display: inline-block;
-  content: '';
-  width: 4px;
-  height: 18px;
-  background: #0B58FF;
-  border-radius: 1px;
-  margin-right: 8PX;
-  margin-top: 8px;
-}
-
-.containerTop {
-  margin-top: 8px;
 
   .smallTitle {
     font-size: 16px;
@@ -989,7 +1005,24 @@ export default {
     background: #0b58ff;
     content: "";
     margin-right: 8px;
-    vertical-align: -3px;
+    vertical-align: -9px;
   }
 }
+
+.containerTop {
+  height: calc((100vh - 170px));
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 4px 16px 16px 16px;
+}
+
+.blueTip::before {
+  display: inline-block;
+    width: 4px;
+    height: 16px;
+    background: #0b58ff;
+    content: "";
+    margin-right: 8px;
+    vertical-align: -3px;
+}
 </style>

src/views/report/productionSituationTablets.vue

@@ -3,7 +3,7 @@
     <ButtonNav style="padding: 0;" :menus="['邯郸', '瑞昌']" :button-mode="true" @change="currentMenu = $event">
     </ButtonNav>
     <div class="search">
-      <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
+      <el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
         <el-form-item label="时间维度" prop="type">
           <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
@@ -11,7 +11,7 @@
           </el-select>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
             start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
             end-placeholder="结束日期">
           </el-date-picker>
@@ -55,37 +55,62 @@
 
       <!-- <bmSearchBar @getSearch="getSearch" @handleExport="handleExport" /> -->
       <el-row v-if="this.listQuery.type === 2">
-        <el-col :span="12">
+        <el-col :span="18">
           <div class="blueTip">
             生产情况对比
           </div>
-          <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
-            :legendList="legendList" ref="dayChart" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
-        </el-col>
-        <el-col :span="6" style="margin-top: 30px">
-          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
-            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart" :chartId=" 'chartTarget'"
-            :chartNum="chartNum" />
         </el-col>
         <el-col :span="6">
           <div class="blueTip">
             {{ title }}
           </div>
+        </el-col>
+      </el-row>
+      <el-row v-else-if="this.listQuery.type === 1 || this.listQuery.type === 0">
+        <el-col :span="24">
+          <div class="blueTip">
+            生产情况对比
+          </div>
+        </el-col>
+      </el-row>
+      <el-row v-else>
+        <div class="blueTip">
+          生产情况对比
+        </div>
+      </el-row>
+      <el-row v-if="this.listQuery.type === 2">
+        <el-col :span="12">
+          <!-- <div class="blueTip">
+            生产情况对比
+          </div> -->
+          <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
+            :legendList="legendList" ref="dayChart" :chartMsg="chartMsg" :chartId="chartId" :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6">
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
+            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" ref="dayTargetChart" :chartId=" 'chartTarget'"
+            :chartNum="chartNum" />
+        </el-col>
+        <el-col :span="6">
+          <!-- <div class="blueTip">
+            {{ title }}
+          </div> -->
           <bm-line-bar-year-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
             :chartMsg="chartMsgYearTarget" ref="chartYearTarget" :chartId=" 'chartYearTarget'" :chartNum="chartNum" />
         </el-col>
       </el-row>
       <el-row v-else-if="this.listQuery.type === 1 || this.listQuery.type === 0">
         <el-col :span="18">
-          <div class="blueTip">
+          <!-- <div class="blueTip">
             生产情况对比
-          </div>
+          </div> -->
           <bm-line-bar :type="listQuery.type" style="margin-top: 20px;" :show="false" :chartHeight="chartHeight"
             :legendList="legendList" :chartMsg="chartMsg" :chartId="'chartDay'" :chartNum="chartNum" />
         </el-col>
-        <el-col :span="6" style="margin-top: 30px">
+        <el-col :span="6">
-          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList"
+          <bm-line-bar-target :type="listQuery.type" :chartHeight="chartHeight"
-            :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId=" 'chartDayTarget'" :chartNum="chartNum" />
+            :legendList="legendList" :chartMsg="chartMsgTarget" :gridLeft="gridLeft" :chartId="'chartDayTarget'"
+            :chartNum="chartNum" />
         </el-col>
         <!-- <el-col :span="6">
           <div class="blueTip">
@@ -96,9 +121,9 @@
         </el-col> -->
       </el-row>
       <el-row v-else>
-        <div class="blueTip">
+        <!-- <div class="blueTip">
           生产情况对比
-        </div>
+        </div> -->
         <!-- <el-col :span="12"> -->
         <bm-line-bar :type="listQuery.type" :chartHeight="chartHeight" :legendList="legendList" :chartMsg="chartMsg"
           :chartId="chartId" :chartNum="chartNum" />
@@ -125,18 +150,18 @@ export default {
   name: "ChipYieldBM",
   data() {
     return {
-      otherProps:[],
+      otherProps: [],
       start: undefined,
-      currentMenu:'邯郸',
+      currentMenu: '邯郸',
       end: undefined,
       title: '',
-      gridLeft:true,
+      gridLeft: true,
-      showTable:false,
+      showTable: false,
       listQuery: {
         pageNo: 1,
         start: undefined,
         end: undefined,
-        pageSize:999,
+        pageSize: 999,
         // size: 10,
         // current: 1,
         factory: null,
@@ -195,7 +220,7 @@ export default {
             data: [
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               color: "#8EF0AB",
@@ -210,7 +235,7 @@ export default {
             data: [
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -225,7 +250,7 @@ export default {
             data: [
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [18, -16],
@@ -239,7 +264,7 @@ export default {
             name: "BIPV产量",
             data: [],
             type: "bar",
-              barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [20, -16],
@@ -252,10 +277,10 @@ export default {
         ],
       },
       chartMsgTarget: {
-        color: [ "#8EF0AB", 'rgba(104, 196, 131, .3)', "#288AFF", 'rgba(40, 138, 255, .2)', "#64BDFF", 'rgba(100,189,255,.3)', '#7164FF', 'rgba(113,100,255,.2)',],
+        color: ["#8EF0AB", 'rgba(104, 196, 131, .3)', "#288AFF", 'rgba(40, 138, 255, .2)', "#64BDFF", 'rgba(100,189,255,.3)', '#7164FF', 'rgba(113,100,255,.2)',],
         xData: [],
         yName: "单位/片",
-        yAxis:{
+        yAxis: {
           type: "value",
           name: "单位/片",
           show: true,
@@ -279,7 +304,7 @@ export default {
         color: ["#8EF0AB", "#288AFF", "#64BDFF", '#7164FF'],
         xData: [],
         yName: "单位/片",
-        yAxis:{
+        yAxis: {
           type: "value",
           name: "单位/片",
           nameTextStyle: {
@@ -302,7 +327,7 @@ export default {
             data: [
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -317,7 +342,7 @@ export default {
             data: [
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -332,7 +357,7 @@ export default {
             data: [
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [5, -16],
@@ -346,7 +371,7 @@ export default {
             name: "BIPV产量",
             data: [],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [10, -16],
@@ -390,7 +415,7 @@ export default {
         {
           factory: null,
           item: 'BIPV产量',
-          unit: 'm2'
+          unit: '㎡'
         },]
       } else {
         return [{
@@ -489,12 +514,29 @@ export default {
     // this.getOverView()
     const today = new Date()
     const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
-    this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD')
+    this.listQuery.startDate = this.getFirstDay()
-    this.listQuery.endDate = moment(today).format('yyyy-MM-DD')
+    this.listQuery.endDate = this.getLastDay()
     this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate]
     this.getDataList()
   },
   methods: {
+    getFirstDay() {
+      //当前月第一天
+      var y = new Date().getFullYear(); //获取年份
+      var m = new Date().getMonth() + 1; //获取月份
+      var d = "01";
+      m = m < 10 ? "0" + m : m; //月份补 0
+      return [y, m, d].join("-");
+    },
+    getLastDay() {
+      //当前月最后一天
+      var y = new Date().getFullYear(); //获取年份
+      var m = new Date().getMonth() + 1; //获取月份
+      var d = new Date(y, m, 0).getDate(); //获取当月最后一日
+      m = m < 10 ? "0" + m : m; //月份补 0
+      d = d < 10 ? "0" + d : d; //日数补 0
+      return [y, m, d].join("-");
+    },
     handleChange() {
       this.listQuery.reportTime = []
       this.listQuery.end = null
@@ -631,12 +673,14 @@ export default {
       if (this.chartMsgYearTarget.series[3]) {
         this.chartMsgYearTarget.series[3].data = []
       }
-      // console.log(this.listQuery);
+      console.log(this.listQuery)
-      if (this.listQuery.type == null) {
+      if (this.listQuery.type === '') {
-        return this.$message('请选择时间维度')
+        this.$message.warning('请选择时间维度！')
+        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        return this.$message('请选择起止时间')
+        this.$message.warning('请选择起止时间')
+        return
       }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
@@ -647,6 +691,7 @@ export default {
         // this.chartMsg.xData.push(ele.titleValue.replace(/[^\d]/g, " "))
         this.otherProps.push({
           label: ele.titleValue,
+          filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
           prop: 'value' + i
         })
       })
@@ -702,7 +747,7 @@ export default {
         // res.data.list.forEach((ele) => {
         res.data.list.slice(0, res.data.list.length - 3).forEach((ele, index) => {
           // let i = index + 1
-          this.chartMsg.xData.push(ele.titleValue.slice(0, ele.titleValue.length-3))
+          this.chartMsg.xData.push(ele.titleValue.slice(0, ele.titleValue.length - 3))
           ele.productionSituationDataVOList.forEach((item) => {
             this.chartMsg.series[0].data.push({
               name: ele.titleValue,
@@ -734,7 +779,7 @@ export default {
         //     { name: "%", value: 85 },
         //   ],
         //   type: "bar",
-        //   barWidth: 20,
+        //     barWidth: 16,
         //   barGap: '0',
         //   label: {
         //     show: true,
@@ -779,13 +824,13 @@ export default {
           name: "FTO投入完成值",
           data: [
             // s
-            { name: 'FTO投入完成值', value: obj.ftoInput,titleValue: obj.ftoInput },
+            { name: 'FTO投入完成值', value: obj.ftoInput, titleValue: obj.ftoInput },
             // { name: 'FTO投入完成值', value: 33 },
             // { name: "%", value: 85 },
             // { name: "%", value: 85 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           stack: 'f',
           label: {
             show: true,
@@ -805,7 +850,7 @@ export default {
             // { name: "%", value: 85 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           stack: 'f',
           label: {
             show: true,
@@ -827,12 +872,12 @@ export default {
             // { name: "%", value: 18.4 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           // barGap: '-100%',
           label: {
             show: true,
             color: "rgba(40,138,255)",
-            position: [-18, -16],
+            position: [-10, -16],
             formatter: function (params) {
               return params.value
             },
@@ -848,11 +893,11 @@ export default {
             // { name: "%", value: 18.4 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           // barGap: '-100%',
           label: {
             show: true,
-            position: [-18, -16],
+            position: [-10, -16],
             color: "rgba(40,138,255,.2)",
             formatter: function (params) {
               return params.value
@@ -869,7 +914,7 @@ export default {
             // { name: "%", value: 80.2 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           label: {
             color: "rgba(100,189,255)",
             show: true,
@@ -889,7 +934,7 @@ export default {
             // { name: "%", value: 80.2 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           label: {
             show: true,
             position: [0, -16],
@@ -910,7 +955,7 @@ export default {
               // { name: "%", value: 80.2 },
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -930,7 +975,7 @@ export default {
               // { name: "%", value: 80.2 },
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -1015,7 +1060,7 @@ export default {
         //     { name: "%", value: 85 },
         //   ],
         //   type: "bar",
-        //   barWidth: 20,
+        //     barWidth: 16,
         //   barGap: '0',
         //   label: {
         //     show: true,
@@ -1064,7 +1109,7 @@ export default {
             // { name: "%", value: 85 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           stack: 'f',
           label: {
             show: true,
@@ -1084,7 +1129,7 @@ export default {
             // { name: "%", value: 85 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           stack: 'f',
           label: {
             show: true,
@@ -1106,7 +1151,7 @@ export default {
             // { name: "%", value: 18.4 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           // barGap: '-100%',
           label: {
             show: true,
@@ -1127,7 +1172,7 @@ export default {
             // { name: "%", value: 18.4 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           // barGap: '-100%',
           label: {
             show: true,
@@ -1148,7 +1193,7 @@ export default {
             // { name: "%", value: 80.2 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           label: {
             color: "rgba(100,189,255)",
             show: true,
@@ -1168,7 +1213,7 @@ export default {
             // { name: "%", value: 80.2 },
           ],
           type: "bar",
-          barWidth: 20,
+          barWidth: 16,
           label: {
             show: true,
             position: [0, -16],
@@ -1189,7 +1234,7 @@ export default {
               // { name: "%", value: 80.2 },
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -1209,7 +1254,7 @@ export default {
               // { name: "%", value: 80.2 },
             ],
             type: "bar",
-            barWidth: 20,
+            barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -1327,29 +1372,6 @@ export default {
   border-radius: 8px;
   padding: 16px 16px 0 16px;
   margin: 8px 0px;
-}
-
-.containerTop {
-  height: calc((100vh - 170px));
-  background-color: #fff;
-  border-radius: 8px;
-  padding: 16px;
-}
-
-.blueTip::before {
-  display: inline-block;
-  content: '';
-  width: 4px;
-  height: 18px;
-  background: #0B58FF;
-  border-radius: 1px;
-  margin-right: 8PX;
-  margin-top: 8px;
-}
-
-.containerTop {
-  margin-top: 8px;
-
   .smallTitle {
       font-size: 16px;
       color: #000;
@@ -1363,7 +1385,31 @@ export default {
       background: #0b58ff;
       content: "";
       margin-right: 8px;
-    vertical-align: -3px;
+      vertical-align: -9px;
     }
 }
+
+.containerTop {
+  height: calc((100vh - 170px));
+  background-color: #fff;
+  border-radius: 8px;
+  padding: 4px 16px 16px 16px;
+}
+
+.blueTip::before {
+  display: inline-block;
+  content: '';
+  width: 4px;
+  height: 18px;
+  background: #0B58FF;
+  border-radius: 1px;
+  margin-right: 8px;
+  vertical-align:-3px;
+}
+
+.containerTop {
+  margin-top: 8px;
+
+
+}
 </style>

src/views/report/productionYield.vue

@@ -5,7 +5,7 @@
     </ButtonNav>
     <!-- </div> -->
     <div class="search">
-      <el-form :model="listQuery" :inline="true" ref="dataForm" class="blueTip">
+      <el-form :model="listQuery" :inline="true" ref="dataForm" class="smallTitle">
         <el-form-item label="时间维度" prop="type">
           <el-select size="small" clearable v-model="listQuery.type" placeholder="请选择" @change="handleChange">
             <el-option v-for="item in timeList" :key="item.value" :label="item.label" :value="item.value">
@@ -13,7 +13,7 @@
           </el-select>
         </el-form-item>
         <el-form-item v-show="listQuery.type === 0 || listQuery.type === ''" label="时间范围" prop="reportTime">
-          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="datetimerange" range-separator="至"
+          <el-date-picker size="small" clearable v-model="listQuery.reportTime" type="daterange" range-separator="至"
             start-placeholder="开始日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd" @change="changeDayTime"
             end-placeholder="结束日期">
           </el-date-picker>
@@ -84,8 +84,8 @@
             :chartMsg="chartMsgYearTarget" :chartId=" 'yearData'" :chartNum="chartNum" />
         </el-col> -->
       </el-row>
-      <base-table :key="showTable" :table-props="tableProps" :page="listQuery.current"
+      <base-table :key="showTable" :table-props="tableProps" :page="listQuery.current" :limit="listQuery.size"
-        :limit="listQuery.size" :table-data="tableData" :max-height="tableH" />
+        :table-data="tableData" :max-height="tableH" />
     </div>
     <!-- <div class="containerBottom">
 
@@ -96,7 +96,7 @@
 <script>
 import { getProductionYieldSituationMWData, exportProductionYieldSituationMWData } from '@/api/report';
 import bmSearchBar from "./components/bmSearchBar";
-import BmLineBar from "./components/produceLineBar.vue";
+import BmLineBar from "./components/produceLineYieldBar.vue";
 import produceLineBarYearTarget from "./components/produceLineYieldBarTarget.vue";
 import ButtonNav from '@/components/ButtonNav'
 import moment from 'moment'
@@ -146,13 +146,12 @@ export default {
       chartHeight: this.tableHeight(137) / 2 - 111,
       tableH: this.tableHeight(137) / 2 - 70,
       legendList: [
-        {
+        {id: 2, name: "FTO投入", type: 1, color: "#8EF0AB" },
-          id: 1, name: "综合良率", type: 2, color: "#FFCE6A" },
-        {
-          id: 2, name: "FTO投入", type: 1, color: "#8EF0AB" },
         { id: 3, name: "芯片产量", type: 1, color: "#288AFF" },
+        { id: 4, name: "标准组件产量", type: 1, color: "#64BDFF" },
         {
-          id: 4, name: "标准组件产量", type: 1, color: "#64BDFF" },
+          id: 1, name: "综合良率", type: 2, color: "#FFCE6A"
+        },
       ],
       legendListTarget: [
         {
@@ -200,7 +199,7 @@ export default {
             name: "单位/%",
             nameTextStyle: {
               fontSize: 12,
-              align: "right",
+              align: "left",
             },
             axisLabel: {},
           }
@@ -211,7 +210,7 @@ export default {
             // yAxisIndex: 0,
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -226,7 +225,7 @@ export default {
             // type: 'bar',
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -274,18 +273,18 @@ export default {
             splitNumber: 4,
             nameTextStyle: {
               fontSize: 12,
-              align: "right",
+              align: "left",
             },
             axisLabel: {},
           }
         ],
         series: [
           {
-            name: "",
+            name: "FTO投入",
             // yAxisIndex: 0,
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             yAxisIndex: 0,
             label: {
               show: true,
@@ -297,12 +296,12 @@ export default {
             },
           },
           {
-            name: "",
+            name: "芯片产量",
             // yAxisIndex: 0,
             data: [],
             yAxisIndex: 0,
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -313,12 +312,12 @@ export default {
             },
           },
             {
-              name: "",
+              name: "标准组件产量",
               // yAxisIndex: 0,
             data: [],
             type: "bar",
             yAxisIndex: 0,
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -329,10 +328,10 @@ export default {
             },
           },
           {
-            name: "",
+            name: "综合良率",
             data: [],
             type: "line",
-            // barWidth: 20,
+            //   barWidth: 16,
             symbol: "circle",
             symbolSize: 6,
             yAxisIndex: 1,
@@ -417,12 +416,29 @@ export default {
     // this.getOverView()
     const today = new Date()
     const sevenDaysAgo = new Date(today.getTime() - (7 * 24 * 60 * 60 * 1000))
-    this.listQuery.startDate = moment(sevenDaysAgo).format('yyyy-MM-DD')
+    this.listQuery.startDate = this.getFirstDay()
-    this.listQuery.endDate = moment(today).format('yyyy-MM-DD')
+    this.listQuery.endDate = this.getLastDay()
     this.listQuery.reportTime = [this.listQuery.startDate, this.listQuery.endDate]
     this.getDataList()
   },
   methods: {
+    getFirstDay() {
+      //当前月第一天
+      var y = new Date().getFullYear(); //获取年份
+      var m = new Date().getMonth() + 1; //获取月份
+      var d = "01";
+      m = m < 10 ? "0" + m : m; //月份补 0
+      return [y, m, d].join("-");
+    },
+    getLastDay() {
+      //当前月最后一天
+      var y = new Date().getFullYear(); //获取年份
+      var m = new Date().getMonth() + 1; //获取月份
+      var d = new Date(y, m, 0).getDate(); //获取当月最后一日
+      m = m < 10 ? "0" + m : m; //月份补 0
+      d = d < 10 ? "0" + d : d; //日数补 0
+      return [y, m, d].join("-");
+    },
     handleChange() {
       this.listQuery.reportTime = []
       this.listQuery.end = null
@@ -551,11 +567,13 @@ export default {
       this.chartMsgYearTarget.xData = []
       this.chartMsgYearTarget.series[0].data = []
       this.chartMsgYearTarget.series[1].data = []
-      if (this.listQuery.type == null) {
+      if (this.listQuery.type === '') {
-        return this.$message('请选择时间维度')
+        this.$message.warning('请选择时间维度！')
+        return
       }
       if (!this.listQuery.startDate && !this.listQuery.endDate) {
-        return this.$message('请选择起止时间')
+        this.$message.warning('请选择起止时间')
+        return
       }
       let arr = []
       this.currentMenu === '邯郸' ? arr.push(1) : arr.push(0)
@@ -584,12 +602,22 @@ export default {
       if (this.listQuery.type == 2) {
         res.data.list.forEach((ele, index) => {
           let i = index + 1
-          this.chartMsg.xData.push(ele.titleValue)
+          // this.chartMsg.xData.push(ele.titleValue)
           this.otherProps.push({
             label: ele.titleValue,
+            filter: (val) => (val || val === 0 ? parseFloat(val.toFixed(2)) : "-"),
             prop: 'value' + i
           })
         })
+        res.data.list.slice(0,res.data.list.length-1).forEach((ele, index) => {
+          // let i = index + 1
+          this.chartMsg.xData.push(ele.titleValue)
+          // this.otherProps.push({
+          //   label: ele.titleValue,
+          //   filter: (val) => (val || val === 0 ? val : "-"),
+          //   prop: 'value' + i
+          // })
+        })
         this.chartMsgYearTarget.xData.push('FTO投入', '芯片产量', '标准组件产量', '综合良率')
         res.data.list.slice(res.data.list.length - 1, res.data.list.length).forEach((ele) => {
           this.title = ele.titleValue
@@ -601,24 +629,36 @@ export default {
             this.chartMsgYearTarget.series[0].data = [
               {
                 value: item.ftoInput,
+                label: {
+                  color: '#8EF0AB'
+                },
                 itemStyle: {
                   color: '#8EF0AB'
                 }
               },
               {
                 value: item.chipYield,
+                label: {
+                  color: '#288AFF'
+                },
                 itemStyle: {
                   color: '#288AFF'
                 }
               },
               {
                 value: item.componentYield,
+                label: {
+                  color: '#64BDFF'
+                },
                 itemStyle: {
                   color: '#64BDFF'
                 }
               },
               {
                 value: null,
+                label: {
+                  color: '#FFCE6A'
+                },
                 itemStyle: {
                   color: '#FFCE6A'
                 }
@@ -626,24 +666,36 @@ export default {
             this.chartMsgYearTarget.series[1].data = [
               {
                 value: null,
+                label: {
+                  color: '#8EF0AB'
+                },
                 itemStyle: {
                   color: '#8EF0AB'
                 }
               },
               {
                 value: null,
+                label: {
+                  color: '#288AFF'
+                },
                 itemStyle: {
                   color: '#288AFF'
                 }
               },
               {
                 value: null,
+                label: {
+                  color: '#64BDFF'
+                },
                 itemStyle: {
                   color: '#64BDFF'
                 }
               },
               {
                 value: item.ftoInput,
+                label: {
+                  color: '#FFCE6A'
+                },
                 itemStyle: {
                   color: '#FFCE6A'
                 }
@@ -669,42 +721,35 @@ export default {
             dataArr[3]['' + m + ''] = item.comprehensiveYieldRate
           })
         })
-        for (let i in dataArr[0]) {
+        // for (let i in chartDataArr[0]) {
-          this.chartMsg.series[0].name = dataArr[0]['item']
+        //   this.chartMsg.series[0].name = chartDataArr[0]['item']
-          if (i.search('value') === 0) {
+        //   if (i.search('value') === 0) {
+        //     this.chartMsg.series[0].data.push({
+        //       name: chartDataArr[0]['item'],
+        //       value: chartDataArr[0][i] === 0 ? null : chartDataArr[0][i]
+        //     })
+        //   }
+        // }
+        res.data.list.slice(0, res.data.list.length - 1).forEach((ele, index) => {
+          ele.productYieldDataVOList.forEach((item, index) => {
             this.chartMsg.series[0].data.push({
-              name: dataArr[0]['item'],
+              name: ele.titleValue,
-              value: dataArr[0][i] === 0 ? null : dataArr[0][i]
+              value: item.ftoInput === 0 ? null : item.ftoInput
             })
-          }
-        }
-        for (let i in dataArr[1]) {
-          this.chartMsg.series[1].name = dataArr[1]['item']
-          if (i.search('value') === 0) {
             this.chartMsg.series[1].data.push({
-              name: dataArr[1]['item'],
+              name: ele.titleValue,
-              value: dataArr[1][i] === 0 ? null : dataArr[1][i]
+              value: item.chipYield === 0 ? null : item.chipYield
             })
-          }
-        }
-        for (let i in dataArr[2]) {
-          this.chartMsg.series[2].name = dataArr[2]['item']
-          if (i.search('value') === 0) {
             this.chartMsg.series[2].data.push({
-              name: dataArr[2]['item'],
+              name: ele.titleValue,
-              value: dataArr[2][i] === 0 ? null : dataArr[2][i]
+              value: item.componentYield === 0 ? null : item.componentYield
             })
-          }
-        }
-        for (let i in dataArr[3]) {
-          this.chartMsg.series[3].name = dataArr[3]['item']
-          if (i.search('value') === 0) {
             this.chartMsg.series[3].data.push({
-              name: dataArr[3]['item'],
+              name: ele.titleValue,
-              value: dataArr[3][i] === 0 ? null : dataArr[3][i]
+              value: item.comprehensiveYieldRate === 0 ? null : item.comprehensiveYieldRate
+            })
+          })
         })
-          }
-        }
       } else {
         res.data.list.forEach((ele, index) => {
           let i = index + 1
@@ -800,30 +845,45 @@ export default {
 </script>
 
 <style lang="scss" scoped>
+
 .search {
   // height: calc((100px));
   background-color: #fff;
   border-radius: 8px;
   padding: 16px 16px 0 16px;
   margin:8px 0 8px 0px;
+  .smallTitle {
+      font-size: 16px;
+      color: #000;
+      margin-bottom: 15px;
+    }
+
+    .smallTitle::before {
+      display: inline-block;
+      width: 4px;
+      height: 16px;
+      background: #0b58ff;
+      content: "";
+      margin-right: 8px;
+      vertical-align: -9px;
+    }
 }
 
 .containerTop {
   height: calc((100vh - 170px));
   background-color: #fff;
   border-radius: 8px;
-  padding: 16px;
+  padding: 4px 16px 16px 16px;
 }
 
 .blueTip::before {
   display: inline-block;
-  content: '';
     width: 4px;
-  height: 18px;
+    height: 16px;
-  background: #0B58FF;
+    background: #0b58ff;
-  border-radius: 1px;
+    content: "";
-  margin-right: 8PX;
+    margin-right: 8px;
-  margin-top: 8px;
+    vertical-align: -3px;
 }
 
 .containerTop {

src/views/report/scOutputBM/index.vue

@@ -93,7 +93,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
@@ -107,7 +107,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -285,7 +285,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
@@ -299,7 +299,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],

src/views/report/scPerCapitaBM/index.vue

@@ -93,7 +93,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
@@ -107,7 +107,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -272,7 +272,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               // position: [-5, -16],
@@ -286,7 +286,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],

src/views/report/scYieldBM/index.vue

@@ -96,7 +96,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -110,7 +110,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],
@@ -273,7 +273,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [-18, -16],
@@ -287,7 +287,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: [0, -16],

src/views/report/turnoverRateBM/index.vue

@@ -83,7 +83,7 @@ export default {
             name: "1",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             barGap: 0.5,
             label: {
               show: true,
@@ -99,7 +99,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: "top",
@@ -114,7 +114,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: "top",
@@ -129,7 +129,7 @@ export default {
             name: "4",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: "top",
@@ -237,7 +237,7 @@ export default {
               name: "1",
               data: [],
               type: "bar",
-              barWidth: 20,
+                barWidth: 16,
               barGap: 0.5,
               label: {
                 show: true,
@@ -253,7 +253,7 @@ export default {
               name: "2",
               data: [],
               type: "bar",
-              barWidth: 20,
+                barWidth: 16,
               barGap: "100%",
               label: {
                 show: true,
@@ -269,7 +269,7 @@ export default {
               name: "3",
               data: [],
               type: "bar",
-              barWidth: 20,
+                barWidth: 16,
               label: {
                 show: true,
                 position: "top",
@@ -284,7 +284,7 @@ export default {
               name: "4",
               data: [],
               type: "bar",
-              barWidth: 20,
+                barWidth: 16,
               label: {
                 show: true,
                 position: "top",
@@ -376,7 +376,7 @@ export default {
             name: "1",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             barGap: 0.5,
             label: {
               show: true,
@@ -392,7 +392,7 @@ export default {
             name: "2",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: "top",
@@ -407,7 +407,7 @@ export default {
             name: "3",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: "top",
@@ -422,7 +422,7 @@ export default {
             name: "4",
             data: [],
             type: "bar",
-            barWidth: 20,
+              barWidth: 16,
             label: {
               show: true,
               position: "top",